|
@@ -20,12 +20,10 @@ type SQL struct {
|
|
|
@parameter login string
|
|
@parameter login string
|
|
|
@parameter mdp string
|
|
@parameter mdp string
|
|
|
@parameter base string
|
|
@parameter base string
|
|
|
|
|
+@return SQL struct
|
|
|
*/
|
|
*/
|
|
|
func NewMySQL(server, login, mdp, base string) *SQL {
|
|
func NewMySQL(server, login, mdp, base string) *SQL {
|
|
|
db, err := Connect(server, login, mdp, base)
|
|
db, err := Connect(server, login, mdp, base)
|
|
|
- if err != nil {
|
|
|
|
|
- panic(err.Error())
|
|
|
|
|
- }
|
|
|
|
|
s := new(SQL)
|
|
s := new(SQL)
|
|
|
s.db = db
|
|
s.db = db
|
|
|
s.err = err
|
|
s.err = err
|
|
@@ -196,7 +194,7 @@ func (s *SQL) SelectAND(table string, colvals [][]string) ([][]string, error) {
|
|
|
sql := strings.Replace(requete, "*", column.Name(), 1)
|
|
sql := strings.Replace(requete, "*", column.Name(), 1)
|
|
|
rows, errQuery := s.db.Query(sql)
|
|
rows, errQuery := s.db.Query(sql)
|
|
|
if errQuery != nil {
|
|
if errQuery != nil {
|
|
|
- panic("error syntax : " + sql)
|
|
|
|
|
|
|
+ return rsltRow, errors.New("error syntax : " + sql)
|
|
|
}
|
|
}
|
|
|
var bytes []byte
|
|
var bytes []byte
|
|
|
var rsltCol []string
|
|
var rsltCol []string
|