AddVar accept writer

getevo · Mar 9, 2020 · 2a0c3e3 · 2a0c3e3
1 parent 504f427
commit 2a0c3e3
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 14 deletions.
diff --git a/dialects/mssql/mssql.go b/dialects/mssql/mssql.go
@@ -38,8 +38,9 @@ func (dialector Dialector) Migrator(db *gorm.DB) gorm.Migrator {
 	}}}
 }
 
-func (dialector Dialector) BindVar(stmt *gorm.Statement, v interface{}) string {
-	return "@p" + strconv.Itoa(len(stmt.Vars))
+func (dialector Dialector) BindVarTo(writer clause.Writer, stmt *gorm.Statement, v interface{}) {
+	writer.WriteString("@p")
+	writer.WriteString(strconv.Itoa(len(stmt.Vars)))
 }
 
 func (dialector Dialector) QuoteTo(writer clause.Writer, str string) {

diff --git a/dialects/mysql/mysql.go b/dialects/mysql/mysql.go
@@ -36,8 +36,8 @@ func (dialector Dialector) Migrator(db *gorm.DB) gorm.Migrator {
 	}}}
 }
 
-func (dialector Dialector) BindVar(stmt *gorm.Statement, v interface{}) string {
-	return "?"
+func (dialector Dialector) BindVarTo(writer clause.Writer, stmt *gorm.Statement, v interface{}) {
+	writer.WriteByte('?')
 }
 
 func (dialector Dialector) QuoteTo(writer clause.Writer, str string) {

diff --git a/dialects/postgres/postgres.go b/dialects/postgres/postgres.go
@@ -38,8 +38,9 @@ func (dialector Dialector) Migrator(db *gorm.DB) gorm.Migrator {
 	}}}
 }
 
-func (dialector Dialector) BindVar(stmt *gorm.Statement, v interface{}) string {
-	return "$" + strconv.Itoa(len(stmt.Vars))
+func (dialector Dialector) BindVarTo(writer clause.Writer, stmt *gorm.Statement, v interface{}) {
+	writer.WriteByte('$')
+	writer.WriteString(strconv.Itoa(len(stmt.Vars)))
 }
 
 func (dialector Dialector) QuoteTo(writer clause.Writer, str string) {

diff --git a/dialects/sqlite/sqlite.go b/dialects/sqlite/sqlite.go
@@ -35,8 +35,8 @@ func (dialector Dialector) Migrator(db *gorm.DB) gorm.Migrator {
 	}}}
 }
 
-func (dialector Dialector) BindVar(stmt *gorm.Statement, v interface{}) string {
-	return "?"
+func (dialector Dialector) BindVarTo(writer clause.Writer, stmt *gorm.Statement, v interface{}) {
+	writer.WriteByte('?')
 }
 
 func (dialector Dialector) QuoteTo(writer clause.Writer, str string) {

diff --git a/interfaces.go b/interfaces.go
@@ -13,7 +13,7 @@ type Dialector interface {
 	Initialize(*DB) error
 	Migrator(db *DB) Migrator
 	DataTypeOf(*schema.Field) string
-	BindVar(stmt *Statement, v interface{}) string
+	BindVarTo(writer clause.Writer, stmt *Statement, v interface{})
 	QuoteTo(clause.Writer, string)
 	Explain(sql string, vars ...interface{}) string
 }

diff --git a/statement.go b/statement.go
@@ -120,7 +120,7 @@ func (stmt *Statement) AddVar(writer clause.Writer, vars ...interface{}) {
 				writer.WriteString(v.Name)
 			} else {
 				stmt.Vars = append(stmt.Vars, v.Value)
-				writer.WriteString(stmt.DB.Dialector.BindVar(stmt, v.Value))
+				stmt.DB.Dialector.BindVarTo(writer, stmt, v.Value)
 			}
 		case clause.Column, clause.Table:
 			stmt.QuoteTo(writer, v)
@@ -130,15 +130,14 @@ func (stmt *Statement) AddVar(writer clause.Writer, vars ...interface{}) {
 		case []interface{}:
 			if len(v) > 0 {
 				writer.WriteByte('(')
-				stmt.skipResetPlacehodler = true
 				stmt.AddVar(writer, v...)
 				writer.WriteByte(')')
 			} else {
 				writer.WriteString("(NULL)")
 			}
 		default:
 			stmt.Vars = append(stmt.Vars, v)
-			writer.WriteString(stmt.DB.Dialector.BindVar(stmt, v))
+			stmt.DB.Dialector.BindVarTo(writer, stmt, v)
 		}
 	}
 }

diff --git a/tests/dummy_dialecter.go b/tests/dummy_dialecter.go
@@ -18,8 +18,8 @@ func (DummyDialector) Migrator(*gorm.DB) gorm.Migrator {
 	return nil
 }
 
-func (DummyDialector) BindVar(stmt *gorm.Statement, v interface{}) string {
-	return "?"
+func (DummyDialector) BindVarTo(writer clause.Writer, stmt *gorm.Statement, v interface{}) {
+	writer.WriteByte('?')
 }
 
 func (DummyDialector) QuoteTo(writer clause.Writer, str string) {