bug fixed for NewSQLVar()

Author: eehsiao

sqlbuilder.go

@@ -368,7 +368,7 @@ func (sb *SQLBuilder) BuildUpdateSQL() *SQLBuilder {
 	for _, set := range sb.sets {
 		switch set.V.(type) {
 		case SQLVar:
-			setStr += fmt.Sprintf("%s=%s,", EscapeStr(set.K, sb.IsMysql()), EscapeStr((set.V.(SQLVar)).VarS, sb.IsMysql()))
+			setStr += fmt.Sprintf("%s=%s,", EscapeStr(set.K, sb.IsMysql()), (set.V.(SQLVar)).VarS)
 		case string:
 			setStr += fmt.Sprintf("%s='%v',", EscapeStr(set.K, sb.IsMysql()), EscapeStr(set.V.(string), sb.IsMysql()))
 		default:
@@ -406,7 +406,7 @@ func (sb *SQLBuilder) BuildInsertSQL() *SQLBuilder {
 	for _, v := range sb.values[0] {
 		switch v.(type) {
 		case SQLVar:
-			vals += fmt.Sprintf("%v,", EscapeStr(v.(SQLVar).VarS, sb.IsMysql()))
+			vals += fmt.Sprintf("%s,", v.(SQLVar).VarS)
 		case string:
 			vals += fmt.Sprintf("'%v',", EscapeStr(v.(string), sb.IsMysql()))
 		default:
@@ -443,7 +443,7 @@ func (sb *SQLBuilder) BuildBulkInsertSQL() *SQLBuilder {
 		for _, v := range vs {
 			switch v.(type) {
 			case SQLVar:
-				vals += fmt.Sprintf("%v,", EscapeStr(v.(SQLVar).VarS, sb.IsMysql()))
+				vals += fmt.Sprintf("%s,", v.(SQLVar).VarS)
 			case string:
 				vals += fmt.Sprintf("'%v',", EscapeStr(v.(string), sb.IsMysql()))
 			default:

sqlbuilder_test.go

@@ -64,10 +64,10 @@ func TestSQLBuilder_BuildedSQL(t *testing.T) {
 		{
 			name: "case 7 : Bulk INSERT",
 			fn: func(sb *SQLBuilder) {
-				sb.Fields("testDt", "Host", "User", "Select_priv", "testNil").Values(NewSQLVar("current_timestamp"), 1, "\"2", true, nil).Values(NewSQLVar("current_timestamp"), 2, "\"22", true, nil)
+				sb.Fields("testDt", "Host", "User", "Select_priv", "testNil").Values(NewSQLVar("current_timestamp"), 1, "\"2", true, nil).Values(NewSQLVar("datetime('now','localtime')"), 2, "\"22", true, nil)
 				sb.Values(NewSQLVar("current_timestamp"), 3, "\"32", false, nil).Into("user").BuildBulkInsertSQL()
 			},
-			wantSql: `INSERT INTO user (testDt,Host,User,Select_priv,testNil) VALUES (current_timestamp,1,'\"2',true,NULL),(current_timestamp,2,'\"22',true,NULL),(current_timestamp,3,'\"32',false,NULL)`,
+			wantSql: `INSERT INTO user (testDt,Host,User,Select_priv,testNil) VALUES (current_timestamp,1,'\"2',true,NULL),(datetime('now','localtime'),2,'\"22',true,NULL),(current_timestamp,3,'\"32',false,NULL)`,
 		},
 		{
 			name: "case 8 : Where",