Skip to content

Commit 973068d

Browse files
authored
fix(engine/sqlite): fixed detection of column alias without AS (#2560)
* fix(engine/sqlite): fixed detection of column alias without AS fix #2559 * test: update endtoend * test: update endtoend
1 parent b520e90 commit 973068d

File tree

16 files changed

+161
-145
lines changed

16 files changed

+161
-145
lines changed

internal/endtoend/testdata/column_as/mysql/go/models.go

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/column_as/mysql/go/query.sql.go

Lines changed: 28 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
CREATE TABLE foo (email text not null);
1+
-- name: WithAs :one
2+
SELECT 1 AS x, 2 AS y;
23

3-
/* name: ColumnAs :many */
4-
SELECT email AS id FROM foo;
4+
-- name: WithoutAs :one
5+
SELECT 1 x, 2 y;

internal/endtoend/testdata/column_as/postgresql/pgx/v4/go/models.go

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/column_as/postgresql/pgx/v4/go/query.sql.go

Lines changed: 28 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
CREATE TABLE foo (email text not null);
1+
-- name: WithAs :one
2+
SELECT 1 AS x, 2 AS y;
23

3-
-- name: ColumnAs :many
4-
SELECT email AS id FROM foo;
4+
-- name: WithoutAs :one
5+
SELECT 1 x, 2 y;

internal/endtoend/testdata/column_as/postgresql/pgx/v5/go/models.go

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/column_as/postgresql/pgx/v5/go/query.sql.go

Lines changed: 28 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
CREATE TABLE foo (email text not null);
1+
-- name: WithAs :one
2+
SELECT 1 AS x, 2 AS y;
23

3-
-- name: ColumnAs :many
4-
SELECT email AS id FROM foo;
4+
-- name: WithoutAs :one
5+
SELECT 1 x, 2 y;

internal/endtoend/testdata/column_as/postgresql/stdlib/go/models.go

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/column_as/postgresql/stdlib/go/query.sql.go

Lines changed: 28 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
CREATE TABLE foo (email text not null);
1+
-- name: WithAs :one
2+
SELECT 1 AS x, 2 AS y;
23

3-
-- name: ColumnAs :many
4-
SELECT email AS id FROM foo;
4+
-- name: WithoutAs :one
5+
SELECT 1 x, 2 y;

internal/endtoend/testdata/column_as/sqlite/go/models.go

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/endtoend/testdata/column_as/sqlite/go/query.sql.go

Lines changed: 28 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
CREATE TABLE foo (email text not null);
1+
-- name: WithAs :one
2+
SELECT 1 AS x, 2 AS y;
23

3-
/* name: ColumnAs :many */
4-
SELECT email AS id FROM foo;
4+
-- name: WithoutAs :one
5+
SELECT 1 x, 2 y;

internal/engine/sqlite/convert.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ func (c *cc) getCols(core *parser.Select_coreContext) []ast.Node {
496496
continue
497497
}
498498

499-
if col.AS_() != nil {
499+
if col.Column_alias() != nil {
500500
name := identifier(col.Column_alias().GetText())
501501
target.Name = &name
502502
}

0 commit comments

Comments
 (0)