From 850209dcaab89cbeefb5cbaf0b211072d320cfb9 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Fri, 5 Jan 2024 11:04:24 -0800 Subject: [PATCH 1/5] Add test data --- .../params_in_nested_func/mysql/db/db.go | 31 ++++++++++ .../params_in_nested_func/mysql/db/models.go | 20 +++++++ .../mysql/db/query.sql.go | 56 +++++++++++++++++++ .../params_in_nested_func/mysql/query.sql | 10 ++++ .../params_in_nested_func/mysql/schema.sql | 14 +++++ .../params_in_nested_func/mysql/sqlc.yaml | 8 +++ .../params_in_nested_func/postgresql/db/db.go | 31 ++++++++++ .../postgresql/db/models.go | 20 +++++++ .../postgresql/db/query.sql.go | 56 +++++++++++++++++++ .../postgresql/query.sql | 10 ++++ .../postgresql/schema.sql | 14 +++++ .../postgresql/sqlc.yaml | 8 +++ 12 files changed, 278 insertions(+) create mode 100644 internal/endtoend/testdata/params_in_nested_func/mysql/db/db.go create mode 100644 internal/endtoend/testdata/params_in_nested_func/mysql/db/models.go create mode 100644 internal/endtoend/testdata/params_in_nested_func/mysql/db/query.sql.go create mode 100644 internal/endtoend/testdata/params_in_nested_func/mysql/query.sql create mode 100644 internal/endtoend/testdata/params_in_nested_func/mysql/schema.sql create mode 100644 internal/endtoend/testdata/params_in_nested_func/mysql/sqlc.yaml create mode 100644 internal/endtoend/testdata/params_in_nested_func/postgresql/db/db.go create mode 100644 internal/endtoend/testdata/params_in_nested_func/postgresql/db/models.go create mode 100644 internal/endtoend/testdata/params_in_nested_func/postgresql/db/query.sql.go create mode 100644 internal/endtoend/testdata/params_in_nested_func/postgresql/query.sql create mode 100644 internal/endtoend/testdata/params_in_nested_func/postgresql/schema.sql create mode 100644 internal/endtoend/testdata/params_in_nested_func/postgresql/sqlc.yaml diff --git a/internal/endtoend/testdata/params_in_nested_func/mysql/db/db.go b/internal/endtoend/testdata/params_in_nested_func/mysql/db/db.go new file mode 100644 index 0000000000..bdb151c184 --- /dev/null +++ b/internal/endtoend/testdata/params_in_nested_func/mysql/db/db.go @@ -0,0 +1,31 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.25.0 + +package db + +import ( + "context" + "database/sql" +) + +type DBTX interface { + ExecContext(context.Context, string, ...interface{}) (sql.Result, error) + PrepareContext(context.Context, string) (*sql.Stmt, error) + QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error) + QueryRowContext(context.Context, string, ...interface{}) *sql.Row +} + +func New(db DBTX) *Queries { + return &Queries{db: db} +} + +type Queries struct { + db DBTX +} + +func (q *Queries) WithTx(tx *sql.Tx) *Queries { + return &Queries{ + db: tx, + } +} diff --git a/internal/endtoend/testdata/params_in_nested_func/mysql/db/models.go b/internal/endtoend/testdata/params_in_nested_func/mysql/db/models.go new file mode 100644 index 0000000000..b30544076e --- /dev/null +++ b/internal/endtoend/testdata/params_in_nested_func/mysql/db/models.go @@ -0,0 +1,20 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.25.0 + +package db + +import ( + "database/sql" +) + +type Routergroup struct { + Groupid uint32 + Groupname string + Defaultconfigid sql.NullInt32 + Defaultfirmwareversion sql.NullString + Inheritpermissions bool + Parentgroupid sql.NullInt32 + Firmwarepolicy sql.NullString + Styles sql.NullString +} diff --git a/internal/endtoend/testdata/params_in_nested_func/mysql/db/query.sql.go b/internal/endtoend/testdata/params_in_nested_func/mysql/db/query.sql.go new file mode 100644 index 0000000000..82dd70e791 --- /dev/null +++ b/internal/endtoend/testdata/params_in_nested_func/mysql/db/query.sql.go @@ -0,0 +1,56 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.25.0 +// source: query.sql + +package db + +import ( + "context" + "database/sql" +) + +const getGroups = `-- name: GetGroups :many +SELECT + rg.groupId, + rg.groupName +FROM + RouterGroup rg +WHERE + rgr.depth = 1 AND + rg.groupName LIKE CONCAT('%', COALESCE(?, rg.groupName), '%') AND + rg.groupId = COALESCE(?, rg.groupId) +` + +type GetGroupsParams struct { + GroupName interface{} + GroupId sql.NullInt32 +} + +type GetGroupsRow struct { + Groupid uint32 + Groupname string +} + +func (q *Queries) GetGroups(ctx context.Context, arg GetGroupsParams) ([]GetGroupsRow, error) { + rows, err := q.db.QueryContext(ctx, getGroups, arg.GroupName, arg.GroupId) + if err != nil { + return nil, err + } + defer rows.Close() + var items []GetGroupsRow + for rows.Next() { + var i GetGroupsRow + if err := rows.Scan(&i.Groupid, &i.Groupname); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} diff --git a/internal/endtoend/testdata/params_in_nested_func/mysql/query.sql b/internal/endtoend/testdata/params_in_nested_func/mysql/query.sql new file mode 100644 index 0000000000..642e51bbcf --- /dev/null +++ b/internal/endtoend/testdata/params_in_nested_func/mysql/query.sql @@ -0,0 +1,10 @@ +-- name: GetGroups :many +SELECT + rg.groupId, + rg.groupName +FROM + RouterGroup rg +WHERE + rgr.depth = 1 AND + rg.groupName LIKE CONCAT('%', COALESCE(sqlc.narg('groupName'), rg.groupName), '%') AND + rg.groupId = COALESCE(sqlc.narg('groupId'), rg.groupId); diff --git a/internal/endtoend/testdata/params_in_nested_func/mysql/schema.sql b/internal/endtoend/testdata/params_in_nested_func/mysql/schema.sql new file mode 100644 index 0000000000..93304fe2ab --- /dev/null +++ b/internal/endtoend/testdata/params_in_nested_func/mysql/schema.sql @@ -0,0 +1,14 @@ +create table RouterGroup +( + groupId int unsigned auto_increment primary key, + groupName varchar(100) not null, + defaultConfigId int unsigned null, + defaultFirmwareVersion varchar(12) null, + inheritPermissions tinyint(1) default 1 not null, + parentGroupId int unsigned null, + firmwarePolicy varchar(45) null, + styles text null, + constraint RouterGroup_ibfk_1 + foreign key (defaultConfigId) references ConfigScript (configId) + on delete set null +); diff --git a/internal/endtoend/testdata/params_in_nested_func/mysql/sqlc.yaml b/internal/endtoend/testdata/params_in_nested_func/mysql/sqlc.yaml new file mode 100644 index 0000000000..e8b45d313d --- /dev/null +++ b/internal/endtoend/testdata/params_in_nested_func/mysql/sqlc.yaml @@ -0,0 +1,8 @@ +version: '2' +sql: +- schema: schema.sql + queries: query.sql + engine: mysql + gen: + go: + out: db diff --git a/internal/endtoend/testdata/params_in_nested_func/postgresql/db/db.go b/internal/endtoend/testdata/params_in_nested_func/postgresql/db/db.go new file mode 100644 index 0000000000..bdb151c184 --- /dev/null +++ b/internal/endtoend/testdata/params_in_nested_func/postgresql/db/db.go @@ -0,0 +1,31 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.25.0 + +package db + +import ( + "context" + "database/sql" +) + +type DBTX interface { + ExecContext(context.Context, string, ...interface{}) (sql.Result, error) + PrepareContext(context.Context, string) (*sql.Stmt, error) + QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error) + QueryRowContext(context.Context, string, ...interface{}) *sql.Row +} + +func New(db DBTX) *Queries { + return &Queries{db: db} +} + +type Queries struct { + db DBTX +} + +func (q *Queries) WithTx(tx *sql.Tx) *Queries { + return &Queries{ + db: tx, + } +} diff --git a/internal/endtoend/testdata/params_in_nested_func/postgresql/db/models.go b/internal/endtoend/testdata/params_in_nested_func/postgresql/db/models.go new file mode 100644 index 0000000000..f63b3b2f23 --- /dev/null +++ b/internal/endtoend/testdata/params_in_nested_func/postgresql/db/models.go @@ -0,0 +1,20 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.25.0 + +package db + +import ( + "database/sql" +) + +type Routergroup struct { + Groupid int32 + Groupname string + Defaultconfigid sql.NullInt32 + Defaultfirmwareversion sql.NullString + Inheritpermissions interface{} + Parentgroupid sql.NullInt32 + Firmwarepolicy sql.NullString + Styles sql.NullString +} diff --git a/internal/endtoend/testdata/params_in_nested_func/postgresql/db/query.sql.go b/internal/endtoend/testdata/params_in_nested_func/postgresql/db/query.sql.go new file mode 100644 index 0000000000..e0d6156655 --- /dev/null +++ b/internal/endtoend/testdata/params_in_nested_func/postgresql/db/query.sql.go @@ -0,0 +1,56 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.25.0 +// source: query.sql + +package db + +import ( + "context" + "database/sql" +) + +const getGroups = `-- name: GetGroups :many +SELECT + rg.groupId, + rg.groupName +FROM + RouterGroup rg +WHERE + rgr.depth = 1 AND + rg.groupName LIKE CONCAT('%', COALESCE($1::text, rg.groupName), '%') AND + rg.groupId = COALESCE($2, rg.groupId) +` + +type GetGroupsParams struct { + GroupName sql.NullString + GroupId sql.NullInt32 +} + +type GetGroupsRow struct { + Groupid int32 + Groupname string +} + +func (q *Queries) GetGroups(ctx context.Context, arg GetGroupsParams) ([]GetGroupsRow, error) { + rows, err := q.db.QueryContext(ctx, getGroups, arg.GroupName, arg.GroupId) + if err != nil { + return nil, err + } + defer rows.Close() + var items []GetGroupsRow + for rows.Next() { + var i GetGroupsRow + if err := rows.Scan(&i.Groupid, &i.Groupname); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} diff --git a/internal/endtoend/testdata/params_in_nested_func/postgresql/query.sql b/internal/endtoend/testdata/params_in_nested_func/postgresql/query.sql new file mode 100644 index 0000000000..42f6f5e7f7 --- /dev/null +++ b/internal/endtoend/testdata/params_in_nested_func/postgresql/query.sql @@ -0,0 +1,10 @@ +-- name: GetGroups :many +SELECT + rg.groupId, + rg.groupName +FROM + RouterGroup rg +WHERE + rgr.depth = 1 AND + rg.groupName LIKE CONCAT('%', COALESCE(sqlc.narg('groupName')::text, rg.groupName), '%') AND + rg.groupId = COALESCE(sqlc.narg('groupId'), rg.groupId); diff --git a/internal/endtoend/testdata/params_in_nested_func/postgresql/schema.sql b/internal/endtoend/testdata/params_in_nested_func/postgresql/schema.sql new file mode 100644 index 0000000000..d09b3fef23 --- /dev/null +++ b/internal/endtoend/testdata/params_in_nested_func/postgresql/schema.sql @@ -0,0 +1,14 @@ +create table RouterGroup +( + groupId serial primary key, + groupName varchar(100) not null, + defaultConfigId int null, + defaultFirmwareVersion varchar(12) null, + inheritPermissions tinyint(1) default 1 not null, + parentGroupId int null, + firmwarePolicy varchar(45) null, + styles text null, + constraint RouterGroup_ibfk_1 + foreign key (defaultConfigId) references ConfigScript (configId) + on delete set null +); diff --git a/internal/endtoend/testdata/params_in_nested_func/postgresql/sqlc.yaml b/internal/endtoend/testdata/params_in_nested_func/postgresql/sqlc.yaml new file mode 100644 index 0000000000..936b0171ee --- /dev/null +++ b/internal/endtoend/testdata/params_in_nested_func/postgresql/sqlc.yaml @@ -0,0 +1,8 @@ +version: '2' +sql: +- schema: schema.sql + queries: query.sql + engine: postgresql + gen: + go: + out: db From 06b164d9cfe7bca2ba11114da069b13e19b364ae Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Fri, 5 Jan 2024 11:04:50 -0800 Subject: [PATCH 2/5] feat(compiler): Don't drop unknown params Make sure that params are always added --- internal/compiler/analyze.go | 2 ++ internal/compiler/find_params.go | 2 ++ internal/compiler/resolve.go | 28 +++++++++++++++++----------- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/internal/compiler/analyze.go b/internal/compiler/analyze.go index 38d66fce19..6b9e550874 100644 --- a/internal/compiler/analyze.go +++ b/internal/compiler/analyze.go @@ -5,6 +5,7 @@ import ( analyzer "github.com/sqlc-dev/sqlc/internal/analysis" "github.com/sqlc-dev/sqlc/internal/config" + "github.com/sqlc-dev/sqlc/internal/debug" "github.com/sqlc-dev/sqlc/internal/source" "github.com/sqlc-dev/sqlc/internal/sql/ast" "github.com/sqlc-dev/sqlc/internal/sql/named" @@ -174,6 +175,7 @@ func (c *Compiler) _analyzeQuery(raw *ast.RawStmt, query string, failfast bool) } params, err := c.resolveCatalogRefs(qc, rvs, refs, namedParams, embeds) + debug.Dump(params) if err := check(err); err != nil { return nil, err } diff --git a/internal/compiler/find_params.go b/internal/compiler/find_params.go index ca38199b9d..3d49c4e361 100644 --- a/internal/compiler/find_params.go +++ b/internal/compiler/find_params.go @@ -3,6 +3,7 @@ package compiler import ( "fmt" + "github.com/sqlc-dev/sqlc/internal/debug" "github.com/sqlc-dev/sqlc/internal/sql/ast" "github.com/sqlc-dev/sqlc/internal/sql/astutils" ) @@ -12,6 +13,7 @@ func findParameters(root ast.Node) ([]paramRef, []error) { errors := make([]error, 0) v := paramSearch{seen: make(map[int]struct{}), refs: &refs, errs: &errors} astutils.Walk(v, root) + debug.Dump(refs) if len(*v.errs) > 0 { return refs, *v.errs } else { diff --git a/internal/compiler/resolve.go b/internal/compiler/resolve.go index 1947558b25..cd3a31edb7 100644 --- a/internal/compiler/resolve.go +++ b/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) { @@ -411,6 +425,7 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar, } if fun.ReturnType == nil { + addUnknownParam(ref) continue } @@ -420,7 +435,7 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar, Name: fun.ReturnType.Name, }) if err != nil { - // The return type wasn't a table. + addUnknownParam(ref) continue } err = indexTable(table) @@ -607,16 +622,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 From 215f6820e0de1e9072afc59fe0cd65679aa57ed3 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Fri, 5 Jan 2024 11:08:00 -0800 Subject: [PATCH 3/5] Remove debug --- internal/compiler/analyze.go | 2 -- internal/compiler/find_params.go | 2 -- 2 files changed, 4 deletions(-) diff --git a/internal/compiler/analyze.go b/internal/compiler/analyze.go index 6b9e550874..38d66fce19 100644 --- a/internal/compiler/analyze.go +++ b/internal/compiler/analyze.go @@ -5,7 +5,6 @@ import ( analyzer "github.com/sqlc-dev/sqlc/internal/analysis" "github.com/sqlc-dev/sqlc/internal/config" - "github.com/sqlc-dev/sqlc/internal/debug" "github.com/sqlc-dev/sqlc/internal/source" "github.com/sqlc-dev/sqlc/internal/sql/ast" "github.com/sqlc-dev/sqlc/internal/sql/named" @@ -175,7 +174,6 @@ func (c *Compiler) _analyzeQuery(raw *ast.RawStmt, query string, failfast bool) } params, err := c.resolveCatalogRefs(qc, rvs, refs, namedParams, embeds) - debug.Dump(params) if err := check(err); err != nil { return nil, err } diff --git a/internal/compiler/find_params.go b/internal/compiler/find_params.go index 3d49c4e361..ca38199b9d 100644 --- a/internal/compiler/find_params.go +++ b/internal/compiler/find_params.go @@ -3,7 +3,6 @@ package compiler import ( "fmt" - "github.com/sqlc-dev/sqlc/internal/debug" "github.com/sqlc-dev/sqlc/internal/sql/ast" "github.com/sqlc-dev/sqlc/internal/sql/astutils" ) @@ -13,7 +12,6 @@ func findParameters(root ast.Node) ([]paramRef, []error) { errors := make([]error, 0) v := paramSearch{seen: make(map[int]struct{}), refs: &refs, errs: &errors} astutils.Walk(v, root) - debug.Dump(refs) if len(*v.errs) > 0 { return refs, *v.errs } else { From 0333008547a5e7ae5870ccb26f1fb39e9ef41458 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Fri, 5 Jan 2024 11:42:54 -0800 Subject: [PATCH 4/5] Fix bug --- internal/compiler/resolve.go | 12 ++++++++++-- .../params_in_nested_func/mysql/db/models.go | 1 - .../testdata/params_in_nested_func/mysql/schema.sql | 6 +----- .../params_in_nested_func/postgresql/db/models.go | 1 - .../params_in_nested_func/postgresql/schema.sql | 6 +----- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/internal/compiler/resolve.go b/internal/compiler/resolve.go index cd3a31edb7..b1fbb1990e 100644 --- a/internal/compiler/resolve.go +++ b/internal/compiler/resolve.go @@ -332,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 @@ -371,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{ @@ -412,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{ @@ -425,7 +429,9 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar, } if fun.ReturnType == nil { - addUnknownParam(ref) + if !added { + addUnknownParam(ref) + } continue } @@ -435,7 +441,9 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar, Name: fun.ReturnType.Name, }) if err != nil { - addUnknownParam(ref) + if !added { + addUnknownParam(ref) + } continue } err = indexTable(table) diff --git a/internal/endtoend/testdata/params_in_nested_func/mysql/db/models.go b/internal/endtoend/testdata/params_in_nested_func/mysql/db/models.go index b30544076e..9a715a9c55 100644 --- a/internal/endtoend/testdata/params_in_nested_func/mysql/db/models.go +++ b/internal/endtoend/testdata/params_in_nested_func/mysql/db/models.go @@ -13,7 +13,6 @@ type Routergroup struct { Groupname string Defaultconfigid sql.NullInt32 Defaultfirmwareversion sql.NullString - Inheritpermissions bool Parentgroupid sql.NullInt32 Firmwarepolicy sql.NullString Styles sql.NullString diff --git a/internal/endtoend/testdata/params_in_nested_func/mysql/schema.sql b/internal/endtoend/testdata/params_in_nested_func/mysql/schema.sql index 93304fe2ab..12e0fb3b85 100644 --- a/internal/endtoend/testdata/params_in_nested_func/mysql/schema.sql +++ b/internal/endtoend/testdata/params_in_nested_func/mysql/schema.sql @@ -4,11 +4,7 @@ create table RouterGroup groupName varchar(100) not null, defaultConfigId int unsigned null, defaultFirmwareVersion varchar(12) null, - inheritPermissions tinyint(1) default 1 not null, parentGroupId int unsigned null, firmwarePolicy varchar(45) null, - styles text null, - constraint RouterGroup_ibfk_1 - foreign key (defaultConfigId) references ConfigScript (configId) - on delete set null + styles text null ); diff --git a/internal/endtoend/testdata/params_in_nested_func/postgresql/db/models.go b/internal/endtoend/testdata/params_in_nested_func/postgresql/db/models.go index f63b3b2f23..c1a3fd0665 100644 --- a/internal/endtoend/testdata/params_in_nested_func/postgresql/db/models.go +++ b/internal/endtoend/testdata/params_in_nested_func/postgresql/db/models.go @@ -13,7 +13,6 @@ type Routergroup struct { Groupname string Defaultconfigid sql.NullInt32 Defaultfirmwareversion sql.NullString - Inheritpermissions interface{} Parentgroupid sql.NullInt32 Firmwarepolicy sql.NullString Styles sql.NullString diff --git a/internal/endtoend/testdata/params_in_nested_func/postgresql/schema.sql b/internal/endtoend/testdata/params_in_nested_func/postgresql/schema.sql index d09b3fef23..66cfd02733 100644 --- a/internal/endtoend/testdata/params_in_nested_func/postgresql/schema.sql +++ b/internal/endtoend/testdata/params_in_nested_func/postgresql/schema.sql @@ -4,11 +4,7 @@ create table RouterGroup groupName varchar(100) not null, defaultConfigId int null, defaultFirmwareVersion varchar(12) null, - inheritPermissions tinyint(1) default 1 not null, parentGroupId int null, firmwarePolicy varchar(45) null, - styles text null, - constraint RouterGroup_ibfk_1 - foreign key (defaultConfigId) references ConfigScript (configId) - on delete set null + styles text null ); From 5a8a5820144d04dac214def04535f563e00c6d34 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Fri, 5 Jan 2024 11:50:13 -0800 Subject: [PATCH 5/5] Fix query --- .../testdata/params_in_nested_func/mysql/db/query.sql.go | 1 - internal/endtoend/testdata/params_in_nested_func/mysql/query.sql | 1 - .../testdata/params_in_nested_func/postgresql/db/query.sql.go | 1 - .../endtoend/testdata/params_in_nested_func/postgresql/query.sql | 1 - 4 files changed, 4 deletions(-) diff --git a/internal/endtoend/testdata/params_in_nested_func/mysql/db/query.sql.go b/internal/endtoend/testdata/params_in_nested_func/mysql/db/query.sql.go index 82dd70e791..370187c090 100644 --- a/internal/endtoend/testdata/params_in_nested_func/mysql/db/query.sql.go +++ b/internal/endtoend/testdata/params_in_nested_func/mysql/db/query.sql.go @@ -17,7 +17,6 @@ SELECT FROM RouterGroup rg WHERE - rgr.depth = 1 AND rg.groupName LIKE CONCAT('%', COALESCE(?, rg.groupName), '%') AND rg.groupId = COALESCE(?, rg.groupId) ` diff --git a/internal/endtoend/testdata/params_in_nested_func/mysql/query.sql b/internal/endtoend/testdata/params_in_nested_func/mysql/query.sql index 642e51bbcf..8a2a78fa36 100644 --- a/internal/endtoend/testdata/params_in_nested_func/mysql/query.sql +++ b/internal/endtoend/testdata/params_in_nested_func/mysql/query.sql @@ -5,6 +5,5 @@ SELECT FROM RouterGroup rg WHERE - rgr.depth = 1 AND rg.groupName LIKE CONCAT('%', COALESCE(sqlc.narg('groupName'), rg.groupName), '%') AND rg.groupId = COALESCE(sqlc.narg('groupId'), rg.groupId); diff --git a/internal/endtoend/testdata/params_in_nested_func/postgresql/db/query.sql.go b/internal/endtoend/testdata/params_in_nested_func/postgresql/db/query.sql.go index e0d6156655..a1597ad04e 100644 --- a/internal/endtoend/testdata/params_in_nested_func/postgresql/db/query.sql.go +++ b/internal/endtoend/testdata/params_in_nested_func/postgresql/db/query.sql.go @@ -17,7 +17,6 @@ SELECT FROM RouterGroup rg WHERE - rgr.depth = 1 AND rg.groupName LIKE CONCAT('%', COALESCE($1::text, rg.groupName), '%') AND rg.groupId = COALESCE($2, rg.groupId) ` diff --git a/internal/endtoend/testdata/params_in_nested_func/postgresql/query.sql b/internal/endtoend/testdata/params_in_nested_func/postgresql/query.sql index 42f6f5e7f7..7732269d25 100644 --- a/internal/endtoend/testdata/params_in_nested_func/postgresql/query.sql +++ b/internal/endtoend/testdata/params_in_nested_func/postgresql/query.sql @@ -5,6 +5,5 @@ SELECT FROM RouterGroup rg WHERE - rgr.depth = 1 AND rg.groupName LIKE CONCAT('%', COALESCE(sqlc.narg('groupName')::text, rg.groupName), '%') AND rg.groupId = COALESCE(sqlc.narg('groupId'), rg.groupId);