Merge pull request #186 from tetafro/master

Fix parsing number of argumnets for queries with BETWEEN

Author: kshvakov

helpers.go

@@ -17,8 +17,11 @@ func numInput(query string) int {
 		args           = make(map[string]struct{})
 		reader         = bytes.NewReader([]byte(query))
 		quote, keyword bool
-		like          = newMatcher("like")
+		inBetween      bool
+		like           = newMatcher("like")
 		limit          = newMatcher("limit")
+		between        = newMatcher("between")
+		and            = newMatcher("and")
 	)
 	for {
 		if char, _, err := reader.ReadRune(); err == nil {
@@ -50,6 +53,12 @@ func numInput(query string) int {
 			default:
 				if limit.matchRune(char) || like.matchRune(char) {
 					keyword = true
+				} else if between.matchRune(char) {
+					keyword = true
+					inBetween = true
+				} else if inBetween && and.matchRune(char) {
+					keyword = true
+					inBetween = false
 				} else {
 					keyword = keyword && (char == ' ' || char == '\t' || char == '\n')
 				}

helpers_test.go

@@ -27,9 +27,13 @@ func Test_NumInput(t *testing.T) {
 			?
 		)
 		`: 3,
-		"SELECT * from EXAMPLE LIMIT ?":    1,
-		"SELECT * from EXAMPLE LIMIT ?, ?": 2,
-		"SELECT * from EXAMPLE WHERE os_id like ?": 1,
+		"SELECT * from EXAMPLE LIMIT ?":                                       1,
+		"SELECT * from EXAMPLE LIMIT ?, ?":                                    2,
+		"SELECT * from EXAMPLE WHERE os_id like ?":                            1,
+		"SELECT * FROM example WHERE a BETWEEN ? AND ?":                       2,
+		"SELECT * FROM example WHERE a BETWEEN ? AND ? AND b = ?":             3,
+		"SELECT * FROM example WHERE a = ? AND b BETWEEN ? AND ?":             3,
+		"SELECT * FROM example WHERE a BETWEEN ? AND ? AND b BETWEEN ? AND ?": 4,
 	} {
 		assert.Equal(t, num, numInput(query), query)
 	}