Merge pull request jmoiron#718 from abraithwaite/alan/fix-named-batch

NamedExec Bulk Insert Fix

named.go

@@ -224,21 +224,28 @@ func bindStruct(bindType int, query string, arg interface{}, m *reflectx.Mapper)
 	return bound, arglist, nil
 }
 
-var valueBracketReg = regexp.MustCompile(`\([^(]*.[^(]\)\s*$`)
+var valueBracketReg = regexp.MustCompile(`VALUES\s+(\([^(]*.[^(]\))`)
 
 func fixBound(bound string, loop int) string {
-	loc := valueBracketReg.FindStringIndex(bound)
-	if len(loc) != 2 {
+	loc := valueBracketReg.FindAllStringSubmatchIndex(bound, -1)
+	// Either no VALUES () found or more than one found??
+	if len(loc) != 1 {
+		return bound
+	}
+	// defensive guard. loc should be len 4 representing the starting and
+	// ending index for the whole regex match and the starting + ending
+	// index for the single inside group
+	if len(loc[0]) != 4 {
 		return bound
 	}
 	var buffer bytes.Buffer
 
-	buffer.WriteString(bound[0:loc[1]])
+	buffer.WriteString(bound[0:loc[0][1]])
 	for i := 0; i < loop-1; i++ {
 		buffer.WriteString(",")
-		buffer.WriteString(bound[loc[0]:loc[1]])
+		buffer.WriteString(bound[loc[0][2]:loc[0][3]])
 	}
-	buffer.WriteString(bound[loc[1]:])
+	buffer.WriteString(bound[loc[0][1]:])
 	return buffer.String()
 }
 

named_test.go

@@ -3,6 +3,7 @@ package sqlx
 import (
 	"database/sql"
 	"fmt"
+	"regexp"
 	"testing"
 )
 
@@ -202,7 +203,10 @@ func TestNamedQueries(t *testing.T) {
 			{FirstName: "Ngani", LastName: "Laumape", Email: "[email protected]"},
 		}
 
-		insert := fmt.Sprintf("INSERT INTO person (first_name, last_name, email, added_at) VALUES (:first_name, :last_name, :email, %v)\n", now)
+		insert := fmt.Sprintf(
+			"INSERT INTO person (first_name, last_name, email, added_at) VALUES (:first_name, :last_name, :email, %v)\n",
+			now,
+		)
 		_, err = db.NamedExec(insert, sls)
 		test.Error(err)
 
@@ -214,7 +218,7 @@ func TestNamedQueries(t *testing.T) {
 		}
 
 		_, err = db.NamedExec(`INSERT INTO person (first_name, last_name, email)
-			VALUES (:first_name, :last_name, :email) `, slsMap)
+			VALUES (:first_name, :last_name, :email) ;--`, slsMap)
 		test.Error(err)
 
 		type A map[string]interface{}
@@ -226,7 +230,7 @@ func TestNamedQueries(t *testing.T) {
 		}
 
 		_, err = db.NamedExec(`INSERT INTO person (first_name, last_name, email)
-			VALUES (:first_name, :last_name, :email) `, typedMap)
+			VALUES (:first_name, :last_name, :email) ;--`, typedMap)
 		test.Error(err)
 
 		for _, p := range sls {
@@ -296,3 +300,70 @@ func TestNamedQueries(t *testing.T) {
 
 	})
 }
+
+func TestFixBounds(t *testing.T) {
+	table := []struct {
+		name, query, expect string
+		loop                int
+	}{
+		{
+			name:   `named syntax`,
+			query:  `INSERT INTO foo (a,b,c,d) VALUES (:name, :age, :first, :last)`,
+			expect: `INSERT INTO foo (a,b,c,d) VALUES (:name, :age, :first, :last),(:name, :age, :first, :last)`,
+			loop:   2,
+		},
+		{
+			name:   `mysql syntax`,
+			query:  `INSERT INTO foo (a,b,c,d) VALUES (?, ?, ?, ?)`,
+			expect: `INSERT INTO foo (a,b,c,d) VALUES (?, ?, ?, ?),(?, ?, ?, ?)`,
+			loop:   2,
+		},
+		{
+			name:   `named syntax w/ trailer`,
+			query:  `INSERT INTO foo (a,b,c,d) VALUES (:name, :age, :first, :last) ;--`,
+			expect: `INSERT INTO foo (a,b,c,d) VALUES (:name, :age, :first, :last),(:name, :age, :first, :last) ;--`,
+			loop:   2,
+		},
+		{
+			name:   `mysql syntax w/ trailer`,
+			query:  `INSERT INTO foo (a,b,c,d) VALUES (?, ?, ?, ?) ;--`,
+			expect: `INSERT INTO foo (a,b,c,d) VALUES (?, ?, ?, ?),(?, ?, ?, ?) ;--`,
+			loop:   2,
+		},
+		{
+			name:   `not found test`,
+			query:  `INSERT INTO foo (a,b,c,d) (:name, :age, :first, :last)`,
+			expect: `INSERT INTO foo (a,b,c,d) (:name, :age, :first, :last)`,
+			loop:   2,
+		},
+		{
+			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)`,
+			loop:   2,
+		},
+	}
+
+	for _, tc := range table {
+		t.Run(tc.name, func(t *testing.T) {
+			res := fixBound(tc.query, tc.loop)
+			if res != tc.expect {
+				t.Errorf("mismatched results")
+			}
+		})
+	}
+
+	t.Run("regex changed", func(t *testing.T) {
+		var valueBracketRegChanged = regexp.MustCompile(`(VALUES)\s+(\([^(]*.[^(]\))`)
+		saveRegexp := valueBracketReg
+		defer func() {
+			valueBracketReg = saveRegexp
+		}()
+		valueBracketReg = valueBracketRegChanged
+
+		res := fixBound("VALUES (:a, :b)", 2)
+		if res != "VALUES (:a, :b)" {
+			t.Errorf("changed regex should return string")
+		}
+	})
+}