Fix to allow single column, one level function call and using VALUES after ON DUPLICATE KEY

QuangTung97 · QuangTung97 · commit 5317814184a8 · 2021-04-27T14:17:10.000+07:00
diff --git a/named.go b/named.go
@@ -224,13 +224,13 @@ func bindStruct(bindType int, query string, arg interface{}, m *reflectx.Mapper)
 	return bound, arglist, nil
 }
 
-var valueBracketReg = regexp.MustCompile(`(?i)VALUES\s*(\([^(]*.[^(]\))`)
+var valueBracketReg = regexp.MustCompile(`(?i)VALUES\s*(\((?:[^(]|\([^(]*\))*\))`)
 
 func fixBound(bound string, loop int) string {
 
 	loc := valueBracketReg.FindAllStringSubmatchIndex(bound, -1)
-	// Either no VALUES () found or more than one found??
-	if len(loc) != 1 {
+	// defensive guard when "VALUES (...)" not found
+	if len(loc) < 1 {
 		return bound
 	}
 	// defensive guard. loc should be len 4 representing the starting and
diff --git a/named_test.go b/named_test.go
@@ -105,6 +105,7 @@ type Test struct {
 }
 
 func (t Test) Error(err error, msg ...interface{}) {
+	t.t.Helper()
 	if err != nil {
 		if len(msg) == 0 {
 			t.t.Error(err)
@@ -115,6 +116,7 @@ func (t Test) Error(err error, msg ...interface{}) {
 }
 
 func (t Test) Errorf(err error, format string, args ...interface{}) {
+	t.t.Helper()
 	if err != nil {
 		t.t.Errorf(format, args...)
 	}
@@ -339,7 +341,7 @@ func TestFixBounds(t *testing.T) {
 		{
 			name:   `found twice test`,
 			query:  `INSERT INTO foo (a,b,c,d) VALUES (:name, :age, :first, :last) VALUES (:name, :age, :first, :last)`,
-			expect: `INSERT INTO foo (a,b,c,d) VALUES (:name, :age, :first, :last) VALUES (:name, :age, :first, :last)`,
+			expect: `INSERT INTO foo (a,b,c,d) VALUES (:name, :age, :first, :last),(:name, :age, :first, :last) VALUES (:name, :age, :first, :last)`,
 			loop:   2,
 		},
 		{
@@ -354,6 +356,24 @@ func TestFixBounds(t *testing.T) {
 			expect: `INSERT INTO foo (a,b) values(:a, :b),(:a, :b)`,
 			loop:   2,
 		},
+		{
+			name:   `on duplicate key using VALUES`,
+			query:  `INSERT INTO foo (a,b) VALUES(:a, :b) ON DUPLICATE KEY UPDATE a=VALUES(a)`,
+			expect: `INSERT INTO foo (a,b) VALUES(:a, :b),(:a, :b) ON DUPLICATE KEY UPDATE a=VALUES(a)`,
+			loop:   2,
+		},
+		{
+			name:   `single column`,
+			query:  `INSERT INTO foo (a) VALUES(:a)`,
+			expect: `INSERT INTO foo (a) VALUES(:a),(:a)`,
+			loop:   2,
+		},
+		{
+			name:   `call now`,
+			query:  `INSERT INTO foo (a, b) VALUES(:a, NOW())`,
+			expect: `INSERT INTO foo (a, b) VALUES(:a, NOW()),(:a, NOW())`,
+			loop:   2,
+		},
 	}
 
 	for _, tc := range table {

Original file line number	Diff line number	Diff line change
`@@ -224,13 +224,13 @@ func bindStruct(bindType int, query string, arg interface{}, m *reflectx.Mapper)`
`224`	`224`	`return bound, arglist, nil`
`225`	`225`	`}`
`226`	`226`
`227`		-var valueBracketReg = regexp.MustCompile(`(?i)VALUES\s(\([^(].[^(]\))`)
	`227`	+var valueBracketReg = regexp.MustCompile(`(?i)VALUES\s(\((?:[^(]\|\([^(]\))*\))`)
`228`	`228`
`229`	`229`	`func fixBound(bound string, loop int) string {`
`230`	`230`
`231`	`231`	`loc := valueBracketReg.FindAllStringSubmatchIndex(bound, -1)`
`232`		`- // Either no VALUES () found or more than one found??`
`233`		`- if len(loc) != 1 {`
	`232`	`+ // defensive guard when "VALUES (...)" not found`
	`233`	`+ if len(loc) < 1 {`
`234`	`234`	`return bound`
`235`	`235`	`}`
`236`	`236`	`// defensive guard. loc should be len 4 representing the starting and`