feat(sqlite): support numbered parameter

Author: hakobera

examples/booktest/sqlite/query.sql

@@ -51,13 +51,13 @@ RETURNING *;
 
 /* name: UpdateBook :exec */
 UPDATE books
-SET title = ?, tag = ?
-WHERE book_id = ?;
+SET title = ?1, tag = ?2
+WHERE book_id = ?3;
 
 /* name: UpdateBookISBN :exec */
 UPDATE books
-SET title = ?, tag = ?, isbn = ?
-WHERE book_id = ?;
+SET title = ?1, tag = ?2, isbn = ?4
+WHERE book_id = ?3;
 
 /* name: DeleteAuthorBeforeYear :exec */
 DELETE FROM books

examples/booktest/sqlite/query.sql.go

@@ -1,7 +1,7 @@
 CREATE TABLE foo (name text not null);
 
 -- name: FuncParamIdent :many
-SELECT name FROM foo WHERE name = sqlc.arg(slug);
+SELECT name FROM foo WHERE name = sqlc.arg(slug) and name = sqlc.arg(slug);
 
 -- name: FuncParamString :many
 SELECT name FROM foo WHERE name = sqlc.arg('slug');

internal/endtoend/testdata/join_left/sqlite/go/query.sql.go

@@ -588,26 +588,30 @@ func (c *cc) convertBinaryNode(n *parser.Expr_binaryContext) ast.Node {
 }
 
 func (c *cc) convertParam(n *parser.Expr_bindContext) ast.Node {
-	if n.BIND_PARAMETER() != nil {
+	if n.NUMBERED_BIND_PARAMETER() != nil {
 		// Parameter numbers start at one
 		c.paramCount += 1
+
+		text := n.GetText()
+		number := c.paramCount
+		if len(text) > 1 {
+			number, _ = strconv.Atoi(text[1:])
+		}
 		return &ast.ParamRef{
-			Number:   c.paramCount,
+			Number:   number,
 			Location: n.GetStart().GetStart(),
+			Dollar:   len(text) > 1,
 		}
 	}
-	return todo(n)
-}
 
-func (c *cc) convertNamedParam(n *parser.Expr_named_bindContext) ast.Node {
 	if n.NAMED_BIND_PARAMETER() != nil {
-		c.paramCount += 1
 		return &ast.A_Expr{
 			Name:     &ast.List{Items: []ast.Node{&ast.String{Str: "@"}}},
 			Rexpr:    &ast.String{Str: n.GetText()[1:]},
 			Location: n.GetStart().GetStart(),
 		}
 	}
+
 	return todo(n)
 }
 
@@ -894,9 +898,6 @@ func (c *cc) convert(node node) ast.Node {
 	case *parser.Expr_bindContext:
 		return c.convertParam(n)
 
-	case *parser.Expr_named_bindContext:
-		return c.convertNamedParam(n)
-
 	case *parser.Expr_literalContext:
 		return c.convertLiteral(n)
 

internal/endtoend/testdata/named_param/sqlite/go/query.sql.go

@@ -224,9 +224,9 @@ IDENTIFIER:
 
 NUMERIC_LITERAL: ((DIGIT+ ('.' DIGIT*)?) | ('.' DIGIT+)) (E [-+]? DIGIT+)? | '0x' HEX_DIGIT+;
 
-BIND_PARAMETER: '?' DIGIT* | [:$] IDENTIFIER;
+NUMBERED_BIND_PARAMETER: '?' DIGIT*;
 
-NAMED_BIND_PARAMETER: '@' IDENTIFIER;
+NAMED_BIND_PARAMETER: [:@$] IDENTIFIER;
 
 STRING_LITERAL: '\'' ( ~'\'' | '\'\'')* '\'';
 

internal/endtoend/testdata/sqlc_arg/postgresql/stdlib/go/query.sql.go

@@ -185,7 +185,7 @@ DO_=184
 NOTHING_=185
 IDENTIFIER=186
 NUMERIC_LITERAL=187
-BIND_PARAMETER=188
+NUMBERED_BIND_PARAMETER=188
 NAMED_BIND_PARAMETER=189
 STRING_LITERAL=190
 BLOB_LITERAL=191

internal/endtoend/testdata/sqlc_arg/postgresql/stdlib/query.sql

@@ -272,8 +272,8 @@ drop_stmt:
  */
 expr:
     literal_value #expr_literal
-    | BIND_PARAMETER #expr_bind
-    | NAMED_BIND_PARAMETER #expr_named_bind
+    | NUMBERED_BIND_PARAMETER #expr_bind
+    | NAMED_BIND_PARAMETER #expr_bind
     | ((schema_name DOT)? table_name DOT)? column_name #expr_qualified_column_name
     | unary_operator expr #expr_unary
     | expr PIPE2 expr #expr_binary

internal/endtoend/testdata/sqlc_arg/sqlite/go/query.sql.go

@@ -385,7 +385,7 @@ DO_
 NOTHING_
 IDENTIFIER
 NUMERIC_LITERAL
-BIND_PARAMETER
+NUMBERED_BIND_PARAMETER
 NAMED_BIND_PARAMETER
 STRING_LITERAL
 BLOB_LITERAL

internal/endtoend/testdata/sqlc_narg/sqlite/go/query.sql.go

@@ -185,7 +185,7 @@ DO_=184
 NOTHING_=185
 IDENTIFIER=186
 NUMERIC_LITERAL=187
-BIND_PARAMETER=188
+NUMBERED_BIND_PARAMETER=188
 NAMED_BIND_PARAMETER=189
 STRING_LITERAL=190
 BLOB_LITERAL=191