make regexp non-greedy

didi · Jul 5, 2019 · 2da2d5a · 2da2d5a
1 parent 89d258d
commit 2da2d5a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/builder/builder.go b/builder/builder.go
@@ -391,7 +391,7 @@ const (
 	paramPlaceHolder = "?"
 )
 
-var searchHandle = regexp.MustCompile(`{{\S+}}`)
+var searchHandle = regexp.MustCompile(`{{\S+?}}`)
 
 // NamedQuery is used for expressing complex query
 func NamedQuery(sql string, data map[string]interface{}) (string, []interface{}, error) {

diff --git a/builder/builder_test.go b/builder/builder_test.go
@@ -525,6 +525,18 @@ func TestNamedQuery(t *testing.T) {
 			vals: []interface{}{1},
 			err:  nil,
 		},
+		{
+			sql: `select {{foo}},{{bar}} from tb where age={{age}} and address in {{addr}}`,
+			data: map[string]interface{}{
+				"foo":  "f1",
+				"bar":  "f2",
+				"age":  10,
+				"addr": []string{"beijing", "shanghai", "chengdu"},
+			},
+			cond: `select ?,? from tb where age=? and address in (?,?,?)`,
+			vals: []interface{}{"f1", "f2", 10, "beijing", "shanghai", "chengdu"},
+			err:  nil,
+		},
 	}
 	ass := assert.New(t)
 	for _, tc := range testData {