From b9c943f8fb566b55ac834f40c9168a0eb782b9b8 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Tue, 10 Aug 2021 08:45:52 -0700 Subject: [PATCH 1/2] compiler: Check aliases when resolving references --- internal/compiler/resolve.go | 3 + .../testdata/join_inner/postgresql/go/db.go | 29 ++++++++ .../join_inner/postgresql/go/models.go | 16 +++++ .../join_inner/postgresql/go/query.sql.go | 71 +++++++++++++++++++ .../testdata/join_inner/postgresql/query.sql | 25 +++++++ .../testdata/join_inner/postgresql/sqlc.json | 12 ++++ 6 files changed, 156 insertions(+) create mode 100644 internal/endtoend/testdata/join_inner/postgresql/go/db.go create mode 100644 internal/endtoend/testdata/join_inner/postgresql/go/models.go create mode 100644 internal/endtoend/testdata/join_inner/postgresql/go/query.sql.go create mode 100644 internal/endtoend/testdata/join_inner/postgresql/query.sql create mode 100644 internal/endtoend/testdata/join_inner/postgresql/sqlc.json diff --git a/internal/compiler/resolve.go b/internal/compiler/resolve.go index a762eec21e..c79b293f82 100644 --- a/internal/compiler/resolve.go +++ b/internal/compiler/resolve.go @@ -60,6 +60,9 @@ func resolveCatalogRefs(c *catalog.Catalog, qc *QueryCatalog, rvs []*ast.RangeVa if err != nil { return nil, err } + if _, found := aliasMap[fqn.Name]; found { + continue + } table, err := c.GetTable(fqn) if err != nil { // If the table name doesn't exist, fisrt check if it's a CTE diff --git a/internal/endtoend/testdata/join_inner/postgresql/go/db.go b/internal/endtoend/testdata/join_inner/postgresql/go/db.go new file mode 100644 index 0000000000..6a99519302 --- /dev/null +++ b/internal/endtoend/testdata/join_inner/postgresql/go/db.go @@ -0,0 +1,29 @@ +// Code generated by sqlc. DO NOT EDIT. + +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/join_inner/postgresql/go/models.go b/internal/endtoend/testdata/join_inner/postgresql/go/models.go new file mode 100644 index 0000000000..5055667bf3 --- /dev/null +++ b/internal/endtoend/testdata/join_inner/postgresql/go/models.go @@ -0,0 +1,16 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "database/sql" +) + +type Event struct { + ID sql.NullInt32 +} + +type HandledEvent struct { + LastHandledID sql.NullInt32 + Handler sql.NullString +} diff --git a/internal/endtoend/testdata/join_inner/postgresql/go/query.sql.go b/internal/endtoend/testdata/join_inner/postgresql/go/query.sql.go new file mode 100644 index 0000000000..2cd0bc7db5 --- /dev/null +++ b/internal/endtoend/testdata/join_inner/postgresql/go/query.sql.go @@ -0,0 +1,71 @@ +// Code generated by sqlc. DO NOT EDIT. +// source: query.sql + +package querytest + +import ( + "context" + "database/sql" +) + +const selectAllJoined = `-- name: SelectAllJoined :many +select events.id from events + inner join handled_events + on events.ID > handled_events.last_handled_id +where handled_events.handler = $1 + for update of handled_events skip locked +` + +func (q *Queries) SelectAllJoined(ctx context.Context, handler sql.NullString) ([]sql.NullInt32, error) { + rows, err := q.db.QueryContext(ctx, selectAllJoined, handler) + if err != nil { + return nil, err + } + defer rows.Close() + var items []sql.NullInt32 + for rows.Next() { + var id sql.NullInt32 + if err := rows.Scan(&id); err != nil { + return nil, err + } + items = append(items, id) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const selectAllJoinedAlias = `-- name: SelectAllJoinedAlias :many +select e.id from events e + inner join handled_events he + on e.ID > he.last_handled_id +where he.handler = $1 + for update of he skip locked +` + +func (q *Queries) SelectAllJoinedAlias(ctx context.Context, handler sql.NullString) ([]sql.NullInt32, error) { + rows, err := q.db.QueryContext(ctx, selectAllJoinedAlias, handler) + if err != nil { + return nil, err + } + defer rows.Close() + var items []sql.NullInt32 + for rows.Next() { + var id sql.NullInt32 + if err := rows.Scan(&id); err != nil { + return nil, err + } + items = append(items, id) + } + 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/join_inner/postgresql/query.sql b/internal/endtoend/testdata/join_inner/postgresql/query.sql new file mode 100644 index 0000000000..2d975cf8d6 --- /dev/null +++ b/internal/endtoend/testdata/join_inner/postgresql/query.sql @@ -0,0 +1,25 @@ +create table events +( + ID int +); + +create table handled_events +( + last_handled_id int, + handler text +); + + +-- name: SelectAllJoinedAlias :many +select e.* from events e + inner join handled_events he + on e.ID > he.last_handled_id +where he.handler = $1 + for update of he skip locked; + +-- name: SelectAllJoined :many +select events.* from events + inner join handled_events + on events.ID > handled_events.last_handled_id +where handled_events.handler = $1 + for update of handled_events skip locked; diff --git a/internal/endtoend/testdata/join_inner/postgresql/sqlc.json b/internal/endtoend/testdata/join_inner/postgresql/sqlc.json new file mode 100644 index 0000000000..c72b6132d5 --- /dev/null +++ b/internal/endtoend/testdata/join_inner/postgresql/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "postgresql", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + } + ] +} From d0e442b9905e81002bc715861b0b1da69cd06125 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Tue, 10 Aug 2021 08:55:30 -0700 Subject: [PATCH 2/2] Add testcase for nextval --- .../testdata/nextval/postgresql/go/db.go | 29 +++++++++++++++++++ .../testdata/nextval/postgresql/go/models.go | 9 ++++++ .../nextval/postgresql/go/query.sql.go | 25 ++++++++++++++++ .../testdata/nextval/postgresql/query.sql | 9 ++++++ .../testdata/nextval/postgresql/sqlc.json | 12 ++++++++ 5 files changed, 84 insertions(+) create mode 100644 internal/endtoend/testdata/nextval/postgresql/go/db.go create mode 100644 internal/endtoend/testdata/nextval/postgresql/go/models.go create mode 100644 internal/endtoend/testdata/nextval/postgresql/go/query.sql.go create mode 100644 internal/endtoend/testdata/nextval/postgresql/query.sql create mode 100644 internal/endtoend/testdata/nextval/postgresql/sqlc.json diff --git a/internal/endtoend/testdata/nextval/postgresql/go/db.go b/internal/endtoend/testdata/nextval/postgresql/go/db.go new file mode 100644 index 0000000000..6a99519302 --- /dev/null +++ b/internal/endtoend/testdata/nextval/postgresql/go/db.go @@ -0,0 +1,29 @@ +// Code generated by sqlc. DO NOT EDIT. + +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/nextval/postgresql/go/models.go b/internal/endtoend/testdata/nextval/postgresql/go/models.go new file mode 100644 index 0000000000..ac92fc738e --- /dev/null +++ b/internal/endtoend/testdata/nextval/postgresql/go/models.go @@ -0,0 +1,9 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import () + +type Author struct { + ID int64 +} diff --git a/internal/endtoend/testdata/nextval/postgresql/go/query.sql.go b/internal/endtoend/testdata/nextval/postgresql/go/query.sql.go new file mode 100644 index 0000000000..d8779141be --- /dev/null +++ b/internal/endtoend/testdata/nextval/postgresql/go/query.sql.go @@ -0,0 +1,25 @@ +// Code generated by sqlc. DO NOT EDIT. +// source: query.sql + +package querytest + +import ( + "context" +) + +const getNextID = `-- name: GetNextID :one +SELECT pk, pk FROM + (SELECT nextval('authors_id_seq') as pk) AS alias +` + +type GetNextIDRow struct { + Pk int64 + Pk_2 int64 +} + +func (q *Queries) GetNextID(ctx context.Context) (GetNextIDRow, error) { + row := q.db.QueryRowContext(ctx, getNextID) + var i GetNextIDRow + err := row.Scan(&i.Pk, &i.Pk_2) + return i, err +} diff --git a/internal/endtoend/testdata/nextval/postgresql/query.sql b/internal/endtoend/testdata/nextval/postgresql/query.sql new file mode 100644 index 0000000000..13f6c947ec --- /dev/null +++ b/internal/endtoend/testdata/nextval/postgresql/query.sql @@ -0,0 +1,9 @@ +-- Simple table +CREATE TABLE authors ( + id BIGSERIAL PRIMARY KEY +); + +-- name: GetNextID :one +SELECT pk, pk FROM + (SELECT nextval('authors_id_seq') as pk) AS alias; + diff --git a/internal/endtoend/testdata/nextval/postgresql/sqlc.json b/internal/endtoend/testdata/nextval/postgresql/sqlc.json new file mode 100644 index 0000000000..c72b6132d5 --- /dev/null +++ b/internal/endtoend/testdata/nextval/postgresql/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "postgresql", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + } + ] +}