From d717dbc8d84f6d848465fdab7db958a452ca18be Mon Sep 17 00:00:00 2001 From: zaneli Date: Fri, 10 Feb 2023 00:11:34 +0900 Subject: [PATCH 1/3] fix: Search from Rexpr if not found from Lexpr --- internal/compiler/resolve.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/internal/compiler/resolve.go b/internal/compiler/resolve.go index 4074116e3b..9c2257ac99 100644 --- a/internal/compiler/resolve.go +++ b/internal/compiler/resolve.go @@ -113,6 +113,12 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar, _, ok := node.(*ast.ColumnRef) return ok }) + if len(list.Items) == 0 { + list = astutils.Search(n.Rexpr, func(node ast.Node) bool { + _, ok := node.(*ast.ColumnRef) + return ok + }) + } if len(list.Items) == 0 { // TODO: Move this to database-specific engine package @@ -135,9 +141,9 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar, continue } - switch left := list.Items[0].(type) { + switch node := list.Items[0].(type) { case *ast.ColumnRef: - items := stringSlice(left.Fields) + items := stringSlice(node.Fields) var key, alias string switch len(items) { case 1: @@ -165,7 +171,7 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar, return nil, &sqlerr.Error{ Code: "42703", Message: fmt.Sprintf("table alias \"%s\" does not exist", alias), - Location: left.Location, + Location: node.Location, } } } @@ -204,14 +210,14 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar, return nil, &sqlerr.Error{ Code: "42703", Message: fmt.Sprintf("column \"%s\" does not exist", key), - Location: left.Location, + Location: node.Location, } } if found > 1 { return nil, &sqlerr.Error{ Code: "42703", Message: fmt.Sprintf("column reference \"%s\" is ambiguous", key), - Location: left.Location, + Location: node.Location, } } } From 5ae75fd9f3adcd48a41009db76eae720bf7f0702 Mon Sep 17 00:00:00 2001 From: zaneli Date: Fri, 10 Feb 2023 00:18:05 +0900 Subject: [PATCH 2/3] regenerated existing testdata --- .../testdata/params_duplicate/mysql/go/query.sql.go | 6 +++--- .../testdata/params_duplicate/postgresql/go/query.sql.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/endtoend/testdata/params_duplicate/mysql/go/query.sql.go b/internal/endtoend/testdata/params_duplicate/mysql/go/query.sql.go index 508f8a3c60..50aec57ad9 100644 --- a/internal/endtoend/testdata/params_duplicate/mysql/go/query.sql.go +++ b/internal/endtoend/testdata/params_duplicate/mysql/go/query.sql.go @@ -16,7 +16,7 @@ users where (? = id OR ? = 0) ` type SelectUserByIDParams struct { - ID interface{} + ID int32 } func (q *Queries) SelectUserByID(ctx context.Context, arg SelectUserByIDParams) ([]sql.NullString, error) { @@ -82,12 +82,12 @@ users where (? = id OR ? = 0) ` type SelectUserQuestionParams struct { - Column1 interface{} + ID int32 Column2 interface{} } func (q *Queries) SelectUserQuestion(ctx context.Context, arg SelectUserQuestionParams) ([]sql.NullString, error) { - rows, err := q.db.QueryContext(ctx, selectUserQuestion, arg.Column1, arg.Column2) + rows, err := q.db.QueryContext(ctx, selectUserQuestion, arg.ID, arg.Column2) if err != nil { return nil, err } diff --git a/internal/endtoend/testdata/params_duplicate/postgresql/go/query.sql.go b/internal/endtoend/testdata/params_duplicate/postgresql/go/query.sql.go index 6495541cc9..107ddd8e8a 100644 --- a/internal/endtoend/testdata/params_duplicate/postgresql/go/query.sql.go +++ b/internal/endtoend/testdata/params_duplicate/postgresql/go/query.sql.go @@ -15,7 +15,7 @@ SELECT first_name from users where ($1 = id OR $1 = 0) ` -func (q *Queries) SelectUserByID(ctx context.Context, id interface{}) ([]sql.NullString, error) { +func (q *Queries) SelectUserByID(ctx context.Context, id int32) ([]sql.NullString, error) { rows, err := q.db.QueryContext(ctx, selectUserByID, id) if err != nil { return nil, err @@ -73,8 +73,8 @@ SELECT first_name from users where ($1 = id OR $1 = 0) ` -func (q *Queries) SelectUserQuestion(ctx context.Context, dollar_1 interface{}) ([]sql.NullString, error) { - rows, err := q.db.QueryContext(ctx, selectUserQuestion, dollar_1) +func (q *Queries) SelectUserQuestion(ctx context.Context, id int32) ([]sql.NullString, error) { + rows, err := q.db.QueryContext(ctx, selectUserQuestion, id) if err != nil { return nil, err } From 1bc05c538cb445a11121b01bd1430684b756b884 Mon Sep 17 00:00:00 2001 From: zaneli Date: Fri, 10 Feb 2023 00:37:19 +0900 Subject: [PATCH 3/3] add params_placeholder_in_left_expr test --- .../mysql/go/db.go | 31 ++++++++ .../mysql/go/models.go | 14 ++++ .../mysql/go/query.sql.go | 70 +++++++++++++++++++ .../mysql/query.sql | 10 +++ .../mysql/sqlc.json | 12 ++++ .../postgresql/go/db.go | 31 ++++++++ .../postgresql/go/models.go | 14 ++++ .../postgresql/go/query.sql.go | 70 +++++++++++++++++++ .../postgresql/query.sql | 10 +++ .../postgresql/sqlc.json | 12 ++++ 10 files changed, 274 insertions(+) create mode 100644 internal/endtoend/testdata/params_placeholder_in_left_expr/mysql/go/db.go create mode 100644 internal/endtoend/testdata/params_placeholder_in_left_expr/mysql/go/models.go create mode 100644 internal/endtoend/testdata/params_placeholder_in_left_expr/mysql/go/query.sql.go create mode 100644 internal/endtoend/testdata/params_placeholder_in_left_expr/mysql/query.sql create mode 100644 internal/endtoend/testdata/params_placeholder_in_left_expr/mysql/sqlc.json create mode 100644 internal/endtoend/testdata/params_placeholder_in_left_expr/postgresql/go/db.go create mode 100644 internal/endtoend/testdata/params_placeholder_in_left_expr/postgresql/go/models.go create mode 100644 internal/endtoend/testdata/params_placeholder_in_left_expr/postgresql/go/query.sql.go create mode 100644 internal/endtoend/testdata/params_placeholder_in_left_expr/postgresql/query.sql create mode 100644 internal/endtoend/testdata/params_placeholder_in_left_expr/postgresql/sqlc.json diff --git a/internal/endtoend/testdata/params_placeholder_in_left_expr/mysql/go/db.go b/internal/endtoend/testdata/params_placeholder_in_left_expr/mysql/go/db.go new file mode 100644 index 0000000000..eea4166ec6 --- /dev/null +++ b/internal/endtoend/testdata/params_placeholder_in_left_expr/mysql/go/db.go @@ -0,0 +1,31 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.16.0 + +package querytest + +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_placeholder_in_left_expr/mysql/go/models.go b/internal/endtoend/testdata/params_placeholder_in_left_expr/mysql/go/models.go new file mode 100644 index 0000000000..328703fd07 --- /dev/null +++ b/internal/endtoend/testdata/params_placeholder_in_left_expr/mysql/go/models.go @@ -0,0 +1,14 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.16.0 + +package querytest + +import ( + "database/sql" +) + +type User struct { + ID int32 + Name sql.NullString +} diff --git a/internal/endtoend/testdata/params_placeholder_in_left_expr/mysql/go/query.sql.go b/internal/endtoend/testdata/params_placeholder_in_left_expr/mysql/go/query.sql.go new file mode 100644 index 0000000000..5518b2372f --- /dev/null +++ b/internal/endtoend/testdata/params_placeholder_in_left_expr/mysql/go/query.sql.go @@ -0,0 +1,70 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.16.0 +// source: query.sql + +package querytest + +import ( + "context" + "database/sql" +) + +const findByID = `-- name: FindByID :many +SELECT id, name FROM users WHERE ? = id +` + +func (q *Queries) FindByID(ctx context.Context, id int32) ([]User, error) { + rows, err := q.db.QueryContext(ctx, findByID, id) + if err != nil { + return nil, err + } + defer rows.Close() + var items []User + for rows.Next() { + var i User + if err := rows.Scan(&i.ID, &i.Name); 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 +} + +const findByIDAndName = `-- name: FindByIDAndName :many +SELECT id, name FROM users WHERE ? = id AND ? = name +` + +type FindByIDAndNameParams struct { + ID int32 + Name sql.NullString +} + +func (q *Queries) FindByIDAndName(ctx context.Context, arg FindByIDAndNameParams) ([]User, error) { + rows, err := q.db.QueryContext(ctx, findByIDAndName, arg.ID, arg.Name) + if err != nil { + return nil, err + } + defer rows.Close() + var items []User + for rows.Next() { + var i User + if err := rows.Scan(&i.ID, &i.Name); 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_placeholder_in_left_expr/mysql/query.sql b/internal/endtoend/testdata/params_placeholder_in_left_expr/mysql/query.sql new file mode 100644 index 0000000000..6f2de1e48d --- /dev/null +++ b/internal/endtoend/testdata/params_placeholder_in_left_expr/mysql/query.sql @@ -0,0 +1,10 @@ +CREATE TABLE users ( + id INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY, + name VARCHAR(255) +) ENGINE=InnoDB; + +-- name: FindByID :many +SELECT * FROM users WHERE ? = id; + +-- name: FindByIDAndName :many +SELECT * FROM users WHERE ? = id AND ? = name; diff --git a/internal/endtoend/testdata/params_placeholder_in_left_expr/mysql/sqlc.json b/internal/endtoend/testdata/params_placeholder_in_left_expr/mysql/sqlc.json new file mode 100644 index 0000000000..445bbd1589 --- /dev/null +++ b/internal/endtoend/testdata/params_placeholder_in_left_expr/mysql/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "mysql", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/endtoend/testdata/params_placeholder_in_left_expr/postgresql/go/db.go b/internal/endtoend/testdata/params_placeholder_in_left_expr/postgresql/go/db.go new file mode 100644 index 0000000000..eea4166ec6 --- /dev/null +++ b/internal/endtoend/testdata/params_placeholder_in_left_expr/postgresql/go/db.go @@ -0,0 +1,31 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.16.0 + +package querytest + +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_placeholder_in_left_expr/postgresql/go/models.go b/internal/endtoend/testdata/params_placeholder_in_left_expr/postgresql/go/models.go new file mode 100644 index 0000000000..328703fd07 --- /dev/null +++ b/internal/endtoend/testdata/params_placeholder_in_left_expr/postgresql/go/models.go @@ -0,0 +1,14 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.16.0 + +package querytest + +import ( + "database/sql" +) + +type User struct { + ID int32 + Name sql.NullString +} diff --git a/internal/endtoend/testdata/params_placeholder_in_left_expr/postgresql/go/query.sql.go b/internal/endtoend/testdata/params_placeholder_in_left_expr/postgresql/go/query.sql.go new file mode 100644 index 0000000000..5518b2372f --- /dev/null +++ b/internal/endtoend/testdata/params_placeholder_in_left_expr/postgresql/go/query.sql.go @@ -0,0 +1,70 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.16.0 +// source: query.sql + +package querytest + +import ( + "context" + "database/sql" +) + +const findByID = `-- name: FindByID :many +SELECT id, name FROM users WHERE ? = id +` + +func (q *Queries) FindByID(ctx context.Context, id int32) ([]User, error) { + rows, err := q.db.QueryContext(ctx, findByID, id) + if err != nil { + return nil, err + } + defer rows.Close() + var items []User + for rows.Next() { + var i User + if err := rows.Scan(&i.ID, &i.Name); 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 +} + +const findByIDAndName = `-- name: FindByIDAndName :many +SELECT id, name FROM users WHERE ? = id AND ? = name +` + +type FindByIDAndNameParams struct { + ID int32 + Name sql.NullString +} + +func (q *Queries) FindByIDAndName(ctx context.Context, arg FindByIDAndNameParams) ([]User, error) { + rows, err := q.db.QueryContext(ctx, findByIDAndName, arg.ID, arg.Name) + if err != nil { + return nil, err + } + defer rows.Close() + var items []User + for rows.Next() { + var i User + if err := rows.Scan(&i.ID, &i.Name); 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_placeholder_in_left_expr/postgresql/query.sql b/internal/endtoend/testdata/params_placeholder_in_left_expr/postgresql/query.sql new file mode 100644 index 0000000000..01655c8b62 --- /dev/null +++ b/internal/endtoend/testdata/params_placeholder_in_left_expr/postgresql/query.sql @@ -0,0 +1,10 @@ +CREATE TABLE users ( + id INT PRIMARY KEY, + name VARCHAR(255) +); + +-- name: FindByID :many +SELECT * FROM users WHERE ? = id; + +-- name: FindByIDAndName :many +SELECT * FROM users WHERE ? = id AND ? = name; diff --git a/internal/endtoend/testdata/params_placeholder_in_left_expr/postgresql/sqlc.json b/internal/endtoend/testdata/params_placeholder_in_left_expr/postgresql/sqlc.json new file mode 100644 index 0000000000..c72b6132d5 --- /dev/null +++ b/internal/endtoend/testdata/params_placeholder_in_left_expr/postgresql/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "postgresql", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + } + ] +}