Skip to content

fix(engine/sqlite): fix table_alias rules #2465

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 4 commits into from
Jul 24, 2023
Merged

fix(engine/sqlite): fix table_alias rules #2465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00bc37d
fix(engine/sqlite): fix table_alias rules
orisano Jul 14, 2023
2da9a2a
test: update endtoend
orisano Jul 15, 2023
27c4233
Merge branch 'main' into fix/#2271
kyleconroy Jul 24, 2023
72456a3
Update parser code
kyleconroy Jul 24, 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
31 changes: 31 additions & 0 deletions internal/endtoend/testdata/join_left/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/join_left/sqlite/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,10 @@ FROM users_2 AS u
LEFT JOIN media AS m
ON u.user_avatar_id = m.media_id
WHERE u.user_id != @user_id;

-- name: GetSuggestedUsersByID2 :many
SELECT users_2.user_id
FROM users_2
LEFT JOIN media AS m
ON user_avatar_id = m.media_id
WHERE user_id != @user_id;
4 changes: 4 additions & 0 deletions internal/engine/sqlite/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,6 +791,10 @@ func (c *cc) convertTablesOrSubquery(n []parser.ITable_or_subqueryContext) []ast
alias := from.Table_alias().GetText()
rv.Alias = &ast.Alias{Aliasname: &alias}
}
if from.Table_alias_fallback() != nil {
alias := identifier(from.Table_alias_fallback().GetText())
rv.Alias = &ast.Alias{Aliasname: &alias}
}

tables = append(tables, rv)
} else if from.Table_function_name() != nil {
Expand Down
22 changes: 10 additions & 12 deletions internal/engine/sqlite/parser/SQLiteParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,17 +430,15 @@ compound_select_stmt:
)+ order_by_stmt? limit_stmt?
;

table_or_subquery: (
(schema_name DOT)? table_name (AS_? table_alias)? (
INDEXED_ BY_ index_name
| NOT_ INDEXED_
)?
)
| (schema_name DOT)? table_function_name OPEN_PAR expr (COMMA expr)* CLOSE_PAR (
AS_? table_alias
)?
table_or_subquery:
(schema_name DOT)? table_name (AS_? table_alias)? (INDEXED_ BY_ index_name | NOT_ INDEXED_)?
| (schema_name DOT)? table_function_name OPEN_PAR expr (COMMA expr)* CLOSE_PAR (AS_? table_alias)?
| OPEN_PAR (table_or_subquery (COMMA table_or_subquery)* | join_clause) CLOSE_PAR
| OPEN_PAR select_stmt CLOSE_PAR (AS_? table_alias)?
| (schema_name DOT)? table_name (AS_? table_alias_fallback)? (INDEXED_ BY_ index_name | NOT_ INDEXED_)?
| (schema_name DOT)? table_function_name OPEN_PAR expr (COMMA expr)* CLOSE_PAR (AS_? table_alias_fallback)?
| OPEN_PAR (table_or_subquery (COMMA table_or_subquery)* | join_clause) CLOSE_PAR
| OPEN_PAR select_stmt CLOSE_PAR (AS_? table_alias_fallback)?
;

result_column:
Expand Down Expand Up @@ -880,9 +878,9 @@ savepoint_name:
any_name
;

table_alias:
any_name
;
table_alias: IDENTIFIER | STRING_LITERAL;

table_alias_fallback: any_name;

transaction_name:
any_name
Expand Down
3 changes: 2 additions & 1 deletion internal/engine/sqlite/parser/SQLiteParser.interp
View file
Open in desktop

Large diffs are not rendered by default.

5,228 changes: 2,812 additions & 2,416 deletions internal/engine/sqlite/parser/sqlite_parser.go
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions internal/engine/sqlite/parser/sqliteparser_base_listener.go
View file
Open in desktop

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

6 changes: 6 additions & 0 deletions internal/engine/sqlite/parser/sqliteparser_listener.go
View file
Open in desktop

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