Skip to content

fix(engine/sqlite): fixed detection of column alias without AS#2560

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
andrewmbenton merged 3 commits into from
Aug 2, 2023
Merged

fix(engine/sqlite): fixed detection of column alias without AS #2560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53f417b
fix(engine/sqlite): fixed detection of column alias without AS
orisano Aug 2, 2023
115fefe
test: update endtoend
orisano Aug 2, 2023
ae8709b
test: update endtoend
orisano Aug 2, 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
4 changes: 0 additions & 4 deletions internal/endtoend/testdata/column_as/mysql/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.

51 changes: 28 additions & 23 deletions internal/endtoend/testdata/column_as/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.

7 changes: 4 additions & 3 deletions internal/endtoend/testdata/column_as/mysql/query.sql
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
CREATE TABLE foo (email text not null);
-- name: WithAs :one
SELECT 1 AS x, 2 AS y;

/* name: ColumnAs :many */
SELECT email AS id FROM foo;
-- name: WithoutAs :one
SELECT 1 x, 2 y;
4 changes: 0 additions & 4 deletions internal/endtoend/testdata/column_as/postgresql/pgx/v4/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.

48 changes: 28 additions & 20 deletions internal/endtoend/testdata/column_as/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.

7 changes: 4 additions & 3 deletions internal/endtoend/testdata/column_as/postgresql/pgx/v4/query.sql
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
CREATE TABLE foo (email text not null);
-- name: WithAs :one
SELECT 1 AS x, 2 AS y;

-- name: ColumnAs :many
SELECT email AS id FROM foo;
-- name: WithoutAs :one
SELECT 1 x, 2 y;
4 changes: 0 additions & 4 deletions internal/endtoend/testdata/column_as/postgresql/pgx/v5/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.

48 changes: 28 additions & 20 deletions internal/endtoend/testdata/column_as/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.

7 changes: 4 additions & 3 deletions internal/endtoend/testdata/column_as/postgresql/pgx/v5/query.sql
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
CREATE TABLE foo (email text not null);
-- name: WithAs :one
SELECT 1 AS x, 2 AS y;

-- name: ColumnAs :many
SELECT email AS id FROM foo;
-- name: WithoutAs :one
SELECT 1 x, 2 y;
4 changes: 0 additions & 4 deletions internal/endtoend/testdata/column_as/postgresql/stdlib/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.

51 changes: 28 additions & 23 deletions internal/endtoend/testdata/column_as/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.

7 changes: 4 additions & 3 deletions internal/endtoend/testdata/column_as/postgresql/stdlib/query.sql
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
CREATE TABLE foo (email text not null);
-- name: WithAs :one
SELECT 1 AS x, 2 AS y;

-- name: ColumnAs :many
SELECT email AS id FROM foo;
-- name: WithoutAs :one
SELECT 1 x, 2 y;
4 changes: 0 additions & 4 deletions internal/endtoend/testdata/column_as/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.

51 changes: 28 additions & 23 deletions internal/endtoend/testdata/column_as/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: 4 additions & 3 deletions internal/endtoend/testdata/column_as/sqlite/query.sql
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
CREATE TABLE foo (email text not null);
-- name: WithAs :one
SELECT 1 AS x, 2 AS y;

/* name: ColumnAs :many */
SELECT email AS id FROM foo;
-- name: WithoutAs :one
SELECT 1 x, 2 y;
2 changes: 1 addition & 1 deletion internal/engine/sqlite/convert.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -496,7 +496,7 @@ func (c *cc) getCols(core *parser.Select_coreContext) []ast.Node{
continue
}

if col.AS_() != nil{
if col.Column_alias() != nil{
name := identifier(col.Column_alias().GetText())
target.Name = &name
}
Expand Down