Allow for mixing parameter styles

Author: Baroukh Ovadia

internal/compiler/parse.go

@@ -34,10 +34,8 @@ func (c *Compiler) parseQuery(stmt ast.Node, src string, o opts.Parser) (*Query,
 	if o.Debug.DumpAST {
 		debug.Dump(stmt)
 	}
-	if err := validate.ParamStyle(stmt); err != nil {
-		return nil, err
-	}
-	if err := validate.ParamRef(stmt); err != nil {
+	lastNumber, err := validate.ParamRef(stmt)
+	if err != nil {
 		return nil, err
 	}
 	raw, ok := stmt.(*ast.RawStmt)
@@ -75,7 +73,7 @@ func (c *Compiler) parseQuery(stmt ast.Node, src string, o opts.Parser) (*Query,
 		return nil, err
 	}
 
-	raw, namedParams, edits := rewrite.NamedParameters(c.conf.Engine, raw)
+	raw, namedParams, edits := rewrite.NamedParameters(c.conf.Engine, raw, lastNumber)
 	rvs := rangeVars(raw.Stmt)
 	refs := findParameters(raw.Stmt)
 	if o.UsePositionalParameters {

internal/endtoend/testdata/mix/go/db.go

@@ -0,0 +1,11 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "name": "querytest",
+      "schema": "test.sql",
+      "queries": "test.sql"
+    }
+  ]
+}

internal/endtoend/testdata/mix/go/models.go

@@ -0,0 +1,17 @@
+CREATE TABLE bar (
+	id serial not null,
+	name text not null,
+	phone text not null
+);
+
+-- name: CountOne :one
+SELECT count(1) FROM bar WHERE id = $2 AND phone < @phone_param and name <> $1;
+
+-- name: CountTwo :one
+SELECT count(1) FROM bar WHERE id = sqlc.arg(id_param) AND phone < @phone_param and name <> $1;
+
+-- name: CountThree :one
+SELECT count(1) FROM bar WHERE id > sqlc.arg(id_param) AND name = $1;
+
+-- name: CountFour :one
+SELECT count(1) FROM bar WHERE id > $2 AND phone <> @phone_param  AND name <> $1;

internal/endtoend/testdata/mix/go/test.sql.go

@@ -41,7 +41,7 @@ func isNamedParamSignCast(node ast.Node) bool {
 	return astutils.Join(expr.Name, ".") == "@" && cast
 }
 
-func NamedParameters(engine config.Engine, raw *ast.RawStmt) (*ast.RawStmt, map[int]string, []source.Edit) {
+func NamedParameters(engine config.Engine, raw *ast.RawStmt, argn int) (*ast.RawStmt, map[int]string, []source.Edit) {
 	foundFunc := astutils.Search(raw, named.IsParamFunc)
 	foundSign := astutils.Search(raw, named.IsParamSign)
 	if len(foundFunc.Items)+len(foundSign.Items) == 0 {
@@ -51,7 +51,6 @@ func NamedParameters(engine config.Engine, raw *ast.RawStmt) (*ast.RawStmt, map[
 	hasNamedParameterSupport := engine != config.EngineMySQL
 
 	args := map[string]int{}
-	argn := 0
 	var edits []source.Edit
 	node := astutils.Apply(raw, func(cr *astutils.Cursor) bool {
 		node := cr.Node()

internal/endtoend/testdata/mix/sqlc.json

@@ -8,7 +8,7 @@ import (
 	"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
 )
 
-func ParamRef(n ast.Node) error {
+func ParamRef(n ast.Node) (int, error) {
 	var allrefs []*ast.ParamRef
 
 	// Find all parameter references
@@ -23,14 +23,17 @@ func ParamRef(n ast.Node) error {
 	for _, r := range allrefs {
 		seen[r.Number] = struct{}{}
 	}
-
+	var max int
 	for i := 1; i <= len(seen); i += 1 {
+		if i > max {
+			max = i
+		}
 		if _, ok := seen[i]; !ok {
-			return &sqlerr.Error{
+			return 0, &sqlerr.Error{
 				Code:    "42P18",
 				Message: fmt.Sprintf("could not determine data type of parameter $%d", i),
 			}
 		}
 	}
-	return nil
+	return max, nil
 }