fix stmt slice args

Author: free1139

README.md

@@ -185,12 +185,12 @@ if err := qsql.QueryElem(mdb, &count, "SELECT count(*) FROM a WHERE id = ?", id)
 // Example for the first input:
 mdb := db.GetCache("master") 
 args:=[]int{1,2,3}
-mdb.Query(fmt.Sprintf("select * from table_name where in (%s)", qsql.StmtWhereIn(0,len(args))), qsql.SliceToArgs(args)...)
+mdb.Query(fmt.Sprintf("select * from table_name where in (%s)", qsql.StmtWhereIn(0,len(args))), qsql.StmtSliceArgs(args)...)
 // Or
-mdb.Query(fmt.Sprintf("select * from table_name where in (%s)", qsql.StmtWhereIn(0,len(args), qsql.DRV_NAME_MYSQL), qsql.SliceToArgs(args)...)
+mdb.Query(fmt.Sprintf("select * from table_name where in (%s)", qsql.StmtWhereIn(0,len(args), qsql.DRV_NAME_MYSQL), qsql.StmtSliceArgs(args)...)
 
 // Example for the second input:
-mdb.Query(fmt.Sprintf("select * from table_name where id=? in (%s)", qsql.StmtWhereIn(1,len(args)), id, qsql.SliceToArgs(args)...)
+mdb.Query(fmt.Sprintf("select * from table_name where id=? in (%s)", qsql.StmtWhereIn(1,len(args)), qsql.StmtSliceArgs(id, args)...)
 
 ## Mass query.
 ```text

example/qsql.go

@@ -95,7 +95,7 @@ func main() {
 	whereInCount := 0
 	if err := qsql.QueryElem(mdb, &whereInCount,
 		fmt.Sprintf("SELECT COUNT(*) FROM user WHERE username in (%s)", qsql.StmtWhereIn(0, len(whereIn))),
-		qsql.SliceToArgs(whereIn)...,
+		qsql.StmtSliceArgs(whereIn)...,
 	); err != nil {
 		panic(err)
 	}

where.go

@@ -53,11 +53,19 @@ func StmtWhereIn(paramIdx, paramsLen int, driverName ...string) string {
 	}
 }
 
-func SliceToArgs(arr interface{}) []interface{} {
-	val := reflect.ValueOf(arr)
-	result := make([]interface{}, val.Len())
-	for i := len(result) - 1; i > -1; i-- {
-		result[i] = val.Index(i).Interface()
+func StmtSliceArgs(args ...interface{}) []interface{} {
+	result := []interface{}{}
+	for _, arg := range args {
+		val := reflect.ValueOf(arg)
+		switch val.Kind() {
+		case reflect.Array, reflect.Slice:
+			arrLen := val.Len()
+			for i := 0; i < arrLen; i++ {
+				result = append(result, val.Index(i).Interface())
+			}
+		default:
+			result = append(result, arg)
+		}
 	}
 	return result
 }

where_test.go

@@ -25,9 +25,9 @@ func TestStmtWhereIn(t *testing.T) {
 	}
 }
 
-func TestStmtSliceToArr(t *testing.T) {
+func TestStmtSliceArgs(t *testing.T) {
 	in := []string{"a", "b", "c"}
-	out := SliceToArgs(in)
+	out := StmtSliceArgs(in)
 	if len(out) != 3 {
 		t.Fatalf("expect 3, but:%d", len(out))
 	}