FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix parameter inference for aliased CTE columns by riordanpawley · Pull Request #4586 · sqlc-dev/sqlc · GitHub

/ sqlc Public

Fix parameter inference for aliased CTE columns #4586

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.

Sign up for GitHub

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

Closed
riordanpawley wants to merge 1 commit into from
+122 −5
Conversation 1 Commits 1 Checks 12 Files changed 8
Closed

Fix parameter inference for aliased CTE columns #4586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .go  (5) .sql  (2) .yaml  (1) All 3 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
          • db.go
          • models.go
          • query.sql.go
        • query.sql
        • schema.sql
        • sqlc.yaml
        • query.sql.go
28 changes: 26 additions & 2 deletions internal/compiler/resolve.go
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,26 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
}
return nil
}
indexQueryTable := func(table *Table) error {
columns := make([]*catalog.Column, 0, len(table.Columns))
for _, column := range table.Columns {
columnType := ast.TypeName{Name: column.DataType}
if column.Type != nil {
columnType = *column.Type
}
columns = append(columns, &catalog.Column{
Name: column.Name,
Type: columnType,
IsNotNull: column.NotNull,
IsUnsigned: column.Unsigned,
IsArray: column.IsArray,
ArrayDims: column.ArrayDims,
Comment: column.Comment,
Length: column.Length,
})
}
return indexTable(catalog.Table{Rel: table.Rel, Columns: columns})
}

for _, rv := range rvs {
if rv.Relname == nil {
Expand All @@ -66,8 +86,12 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
if qc == nil {
continue
}
// If the table name doesn't exist, first check if it's a CTE
if _, qcerr := qc.GetTable(fqn); qcerr != nil {
// If the table name doesn't exist, first check if it's a CTE.
queryTable, qcerr := qc.GetTable(fqn)
if qcerr != nil {
return nil, err
}
if err := indexQueryTable(queryTable); err != nil {
return nil, err
}
continue
Expand Down
32 changes: 32 additions & 0 deletions internal/endtoend/testdata/cte_filter_alias/postgresql/pgx/go/db.go
Show comments
View file
Open in desktop

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

13 changes: 13 additions & 0 deletions internal/endtoend/testdata/cte_filter_alias/postgresql/pgx/go/models.go
Show comments
View file
Open in desktop

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

28 changes: 28 additions & 0 deletions internal/endtoend/testdata/cte_filter_alias/postgresql/pgx/go/query.sql.go
Show comments
View file
Open in desktop

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

7 changes: 7 additions & 0 deletions internal/endtoend/testdata/cte_filter_alias/postgresql/pgx/query.sql
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
-- name: CountRecentEvents :one
WITH activity AS (
SELECT happened_at AS activity_at
FROM events
)
SELECT COUNT(*) FILTER (WHERE activity_at >= $1)::bigint AS recent_events
FROM activity;
3 changes: 3 additions & 0 deletions internal/endtoend/testdata/cte_filter_alias/postgresql/pgx/schema.sql
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CREATE TABLE events (
happened_at timestamptz NOT NULL
);
10 changes: 10 additions & 0 deletions internal/endtoend/testdata/cte_filter_alias/postgresql/pgx/sqlc.yaml
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: "2"
sql:
- engine: "postgresql"
schema: "schema.sql"
queries: "query.sql"
gen:
go:
package: "querytest"
out: "go"
sql_package: "pgx/v5"
6 changes: 3 additions & 3 deletions internal/endtoend/testdata/cte_update/postgresql/pgx/go/query.sql.go
Show comments
View file
Open in desktop

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

Loading
Back | FazBrowse Home | New Git URL