Fix: Table contains VALUES

QuangTung97 · QuangTung97 · commit 3ab43dbec927 · 2021-04-28T09:17:11.000+07:00
diff --git a/named.go b/named.go
@@ -224,7 +224,7 @@ func bindStruct(bindType int, query string, arg interface{}, m *reflectx.Mapper)
 	return bound, arglist, nil
 }
 
-var valuesReg = regexp.MustCompile(`(?i)VALUES\s*\(`)
+var valuesReg = regexp.MustCompile(`\)\s*(?i)VALUES\s*\(`)
 
 func findMatchingClosingBracketIndex(s string) int {
 	count := 0
diff --git a/named_test.go b/named_test.go
@@ -385,6 +385,12 @@ func TestFixBounds(t *testing.T) {
 			expect: `INSERT INTO foo (a, b) VALUES (:a, YEAR(NOW())`,
 			loop:   2,
 		},
+		{
+			name:   `table with "values" at the end`,
+			query:  `INSERT INTO table_values (a, b) VALUES (:a, :b)`,
+			expect: `INSERT INTO table_values (a, b) VALUES (:a, :b),(:a, :b)`,
+			loop:   2,
+		},
 	}
 
 	for _, tc := range table {

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ func bindStruct(bindType int, query string, arg interface{}, m *reflectx.Mapper)`
`224`	`224`	`return bound, arglist, nil`
`225`	`225`	`}`
`226`	`226`
`227`		-var valuesReg = regexp.MustCompile(`(?i)VALUES\s*\(`)
	`227`	+var valuesReg = regexp.MustCompile(`\)\s(?i)VALUES\s\(`)
`228`	`228`
`229`	`229`	`func findMatchingClosingBracketIndex(s string) int {`
`230`	`230`	`count := 0`