Skip to content

fix(compiler): Fix column expansion to work with quoted non-keyword identifiers #2576

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

Merged
kyleconroy merged 2 commits into from
Aug 28, 2023
Merged

fix(compiler): Fix column expansion to work with quoted non-keyword identifiers #2576

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41261b5
fix(compiler): Fix column expansion to work with quoted non-keyword i…
orisano Aug 4, 2023
1c2c9eb
test: add endtoend
orisano Aug 4, 2023
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
Prev Previous commit
test: add endtoend
  • Loading branch information
@orisano
orisano committed Aug 4, 2023
commit 1c2c9ebdd0aff842a4a0315bf47d513f3691436a
27 changes: 27 additions & 0 deletions internal/endtoend/testdata/star_expansion/mysql/go/query.sql.go
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions internal/endtoend/testdata/star_expansion/mysql/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@ CREATE TABLE foo (a text, b text);

/* name: StarExpansion :many */
SELECT *, *, foo.* FROM foo;

/* name: StarQuotedExpansion :many */
SELECT `t`.* FROM foo `t`;
24 changes: 24 additions & 0 deletions internal/endtoend/testdata/star_expansion/postgresql/pgx/v4/go/query.sql.go
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions internal/endtoend/testdata/star_expansion/postgresql/pgx/v4/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@ CREATE TABLE foo (a text, b text);

-- name: StarExpansion :many
SELECT *, *, foo.* FROM foo;

-- name: StarQuotedExpansion :many
SELECT "t".* FROM foo "t";
24 changes: 24 additions & 0 deletions internal/endtoend/testdata/star_expansion/postgresql/pgx/v5/go/query.sql.go
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions internal/endtoend/testdata/star_expansion/postgresql/pgx/v5/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@ CREATE TABLE foo (a text, b text);

-- name: StarExpansion :many
SELECT *, *, foo.* FROM foo;

-- name: StarQuotedExpansion :many
SELECT "t".* FROM foo "t";
27 changes: 27 additions & 0 deletions internal/endtoend/testdata/star_expansion/postgresql/stdlib/go/query.sql.go
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions internal/endtoend/testdata/star_expansion/postgresql/stdlib/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@ CREATE TABLE foo (a text, b text);

-- name: StarExpansion :many
SELECT *, *, foo.* FROM foo;

-- name: StarQuotedExpansion :many
SELECT "t".* FROM foo "t";
31 changes: 31 additions & 0 deletions internal/endtoend/testdata/star_expansion/sqlite/go/db.go
View file
Open in desktop

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

14 changes: 14 additions & 0 deletions internal/endtoend/testdata/star_expansion/sqlite/go/models.go
View file
Open in desktop

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

81 changes: 81 additions & 0 deletions internal/endtoend/testdata/star_expansion/sqlite/go/query.sql.go
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/star_expansion/sqlite/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
CREATE TABLE foo (a text, b text);

-- name: StarExpansion :many
SELECT *, *, foo.* FROM foo;

-- name: StarQuotedExpansion :many
SELECT "t".* FROM foo "t";
12 changes: 12 additions & 0 deletions internal/endtoend/testdata/star_expansion/sqlite/sqlc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": "1",
"packages": [
{
"engine": "sqlite",
"path": "go",
"name": "querytest",
"schema": "query.sql",
"queries": "query.sql"
}
]
}