push code

Author: vanhop993

batch.go

@@ -251,7 +251,10 @@ func BuildToInsertBatchWithSchema(table string, models interface{}, driver strin
 		return query, args, nil
 	}
 }
-func BuildToSaveBatchWithSchema(table string, models interface{}, drive string, toArray func(interface{}) interface {
+func BuildToSaveBatch(table string, models interface{}, drive string, options ...*Schema) ([]Statement, error) {
+	return BuildToSaveBatchWithArray(table, models, drive, nil, options...)
+}
+func BuildToSaveBatchWithArray(table string, models interface{}, drive string, toArray func(interface{}) interface {
 	driver.Valuer
 	sql.Scanner
 }, options ...*Schema) ([]Statement, error) {

client/instance.go

@@ -167,7 +167,7 @@ func (c *ProxyClient) SaveBatch(ctx context.Context, table string, models interf
 			return 0, nil
 		}
 	} else {
-		s, er1 := sql.BuildToSaveBatchWithSchema(table, models, driver, nil, options...)
+		s, er1 := sql.BuildToSaveBatchWithArray(table, models, driver, nil, options...)
 		if er1 != nil {
 			return -1, er1
 		}
@@ -243,7 +243,7 @@ func (c *ProxyClient) SaveBatchWithTx(ctx context.Context, tx string, commit boo
 			return 0, nil
 		}
 	} else {
-		s, er1 := sql.BuildToSaveBatchWithSchema(table, models, driver, nil, options...)
+		s, er1 := sql.BuildToSaveBatchWithArray(table, models, driver, nil, options...)
 		if er1 != nil {
 			return -1, er1
 		}

database.go

@@ -512,7 +512,7 @@ func SaveBatchWithArray(ctx context.Context, db *sql.DB, tableName string, model
 	sql.Scanner
 }, options ...*Schema) (int64, error) {
 	driver := GetDriver(db)
-	stmts, er1 := BuildToSaveBatchWithSchema(tableName, models, driver, toArray, options...)
+	stmts, er1 := BuildToSaveBatchWithArray(tableName, models, driver, toArray, options...)
 	if er1 != nil {
 		return 0, er1
 	}

grpc-client/grpc_client.go

@@ -271,7 +271,7 @@ func (c *GRPCClient) SaveBatch(ctx context.Context, table string, models interfa
 			return 0, nil
 		}
 	} else {
-		s, er1 := sql.BuildToSaveBatchWithSchema(table, models, driver, nil, options...)
+		s, er1 := sql.BuildToSaveBatchWithArray(table, models, driver, nil, options...)
 		if er1 != nil {
 			return -1, er1
 		}
@@ -347,7 +347,7 @@ func (c *GRPCClient) SaveBatchWithTx(ctx context.Context, tx string, commit bool
 			return 0, nil
 		}
 	} else {
-		s, er1 := sql.BuildToSaveBatchWithSchema(table, models, driver, nil, options...)
+		s, er1 := sql.BuildToSaveBatchWithArray(table, models, driver, nil, options...)
 		if er1 != nil {
 			return -1, er1
 		}

one.go

@@ -397,14 +397,13 @@ func JSONToColumns(model map[string]interface{}, m map[string]string) map[string
 }
 
 func BuildToDelete(table string, ids map[string]interface{}, buildParam func(int) string) (string, []interface{}) {
-	var values []interface{}
-	var queryArr []string
+	var args []interface{}
+	var where []string
 	i := 1
-	for key, value := range ids {
-		queryArr = append(queryArr, fmt.Sprintf("%v = %v", QuoteColumnName(key), buildParam(i)))
-		values = append(values, value)
+	for col, value := range ids {
+		where = append(where, col+"="+buildParam(i))
+		args = append(args, value)
 		i++
 	}
-	q := strings.Join(queryArr, " and ")
-	return fmt.Sprintf("delete from %v where %v", table, q), values
+	return fmt.Sprintf("delete from %v where %v", table, strings.Join(where, " and ")), args
 }