feat(compiler): Always create parameter (#3112)

* feat(compiler): Don't drop unknown params
* Add test data

Make sure that params are always added

Author: kyleconroy

internal/compiler/resolve.go

@@ -98,6 +98,20 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
 	}
 
 	var a []Parameter
+
+	addUnknownParam := func(ref paramRef) {
+		defaultP := named.NewInferredParam(ref.name, false)
+		p, isNamed := params.FetchMerge(ref.ref.Number, defaultP)
+		a = append(a, Parameter{
+			Number: ref.ref.Number,
+			Column: &Column{
+				Name:         p.Name(),
+				DataType:     "any",
+				IsNamedParam: isNamed,
+			},
+		})
+	}
+
 	for _, ref := range args {
 		switch n := ref.parent.(type) {
 
@@ -318,6 +332,8 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
 					ReturnType: &ast.TypeName{Name: "any"},
 				}
 			}
+
+			var added bool
 			for i, item := range n.Args.Items {
 				funcName := fun.Name
 				var argName string
@@ -357,6 +373,7 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
 
 					defaultP := named.NewInferredParam(defaultName, false)
 					p, isNamed := params.FetchMerge(ref.ref.Number, defaultP)
+					added = true
 					a = append(a, Parameter{
 						Number: ref.ref.Number,
 						Column: &Column{
@@ -398,6 +415,7 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
 
 				defaultP := named.NewInferredParam(paramName, true)
 				p, isNamed := params.FetchMerge(ref.ref.Number, defaultP)
+				added = true
 				a = append(a, Parameter{
 					Number: ref.ref.Number,
 					Column: &Column{
@@ -411,6 +429,9 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
 			}
 
 			if fun.ReturnType == nil {
+				if !added {
+					addUnknownParam(ref)
+				}
 				continue
 			}
 
@@ -420,7 +441,9 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
 				Name:    fun.ReturnType.Name,
 			})
 			if err != nil {
-				// The return type wasn't a table.
+				if !added {
+					addUnknownParam(ref)
+				}
 				continue
 			}
 			err = indexTable(table)
@@ -607,16 +630,7 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
 
 		default:
 			slog.Debug("unsupported reference type", "type", fmt.Sprintf("%T", n))
-			defaultP := named.NewInferredParam(ref.name, false)
-			p, isNamed := params.FetchMerge(ref.ref.Number, defaultP)
-			a = append(a, Parameter{
-				Number: ref.ref.Number,
-				Column: &Column{
-					Name:         p.Name(),
-					DataType:     "any",
-					IsNamedParam: isNamed,
-				},
-			})
+			addUnknownParam(ref)
 		}
 	}
 	return a, nil

internal/endtoend/testdata/params_in_nested_func/mysql/db/db.go

@@ -0,0 +1,9 @@
+-- name: GetGroups :many
+SELECT
+    rg.groupId,
+    rg.groupName
+FROM 
+    RouterGroup rg
+WHERE
+    rg.groupName LIKE CONCAT('%', COALESCE(sqlc.narg('groupName'), rg.groupName), '%') AND
+    rg.groupId = COALESCE(sqlc.narg('groupId'), rg.groupId);

internal/endtoend/testdata/params_in_nested_func/mysql/db/models.go

@@ -0,0 +1,10 @@
+create table RouterGroup
+(
+    groupId                int unsigned auto_increment primary key,
+    groupName              varchar(100)         not null,
+    defaultConfigId        int unsigned         null,
+    defaultFirmwareVersion varchar(12)          null,
+    parentGroupId int unsigned      null,
+    firmwarePolicy         varchar(45)          null,
+    styles                 text                 null
+);

internal/endtoend/testdata/params_in_nested_func/mysql/db/query.sql.go

@@ -0,0 +1,8 @@
+version: '2'
+sql:
+- schema: schema.sql
+  queries: query.sql
+  engine: mysql
+  gen:
+    go:
+      out: db

internal/endtoend/testdata/params_in_nested_func/mysql/query.sql

@@ -0,0 +1,9 @@
+-- name: GetGroups :many
+SELECT
+    rg.groupId,
+    rg.groupName
+FROM 
+    RouterGroup rg
+WHERE
+    rg.groupName LIKE CONCAT('%', COALESCE(sqlc.narg('groupName')::text, rg.groupName), '%') AND
+    rg.groupId = COALESCE(sqlc.narg('groupId'), rg.groupId);

internal/endtoend/testdata/params_in_nested_func/mysql/schema.sql

@@ -0,0 +1,10 @@
+create table RouterGroup
+(
+    groupId                serial primary key,
+    groupName              varchar(100)         not null,
+    defaultConfigId        int         null,
+    defaultFirmwareVersion varchar(12)          null,
+    parentGroupId int      null,
+    firmwarePolicy         varchar(45)          null,
+    styles                 text                 null
+);

internal/endtoend/testdata/params_in_nested_func/mysql/sqlc.yaml

@@ -0,0 +1,8 @@
+version: '2'
+sql:
+- schema: schema.sql
+  queries: query.sql
+  engine: postgresql
+  gen:
+    go:
+      out: db