Skip to content

Check aliases when resolving references #1110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions internal/compiler/resolve.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
29 changes: 29 additions & 0 deletions internal/endtoend/testdata/join_inner/postgresql/go/db.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions internal/endtoend/testdata/join_inner/postgresql/go/models.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

71 changes: 71 additions & 0 deletions internal/endtoend/testdata/join_inner/postgresql/go/query.sql.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions internal/endtoend/testdata/join_inner/postgresql/query.sql
Original file line number Diff line number Diff line change
@@ -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;
12 changes: 12 additions & 0 deletions internal/endtoend/testdata/join_inner/postgresql/sqlc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": "1",
"packages": [
{
"path": "go",
"engine": "postgresql",
"name": "querytest",
"schema": "query.sql",
"queries": "query.sql"
}
]
}
29 changes: 29 additions & 0 deletions internal/endtoend/testdata/nextval/postgresql/go/db.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions internal/endtoend/testdata/nextval/postgresql/go/models.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions internal/endtoend/testdata/nextval/postgresql/go/query.sql.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions internal/endtoend/testdata/nextval/postgresql/query.sql
Original file line number Diff line number Diff line change
@@ -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;

12 changes: 12 additions & 0 deletions internal/endtoend/testdata/nextval/postgresql/sqlc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": "1",
"packages": [
{
"path": "go",
"engine": "postgresql",
"name": "querytest",
"schema": "query.sql",
"queries": "query.sql"
}
]
}