Skip to content

fix(engine/sqlite): fix grammer to avoid missing join_constraint #2732

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 1 commit into from
Sep 14, 2023
Merged

fix(engine/sqlite): fix grammer to avoid missing join_constraint #2732

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
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions internal/endtoend/testdata/join_where_clause/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.

8 changes: 7 additions & 1 deletion internal/endtoend/testdata/join_where_clause/mysql/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,10 @@ WHERE owner = ?;
SELECT foo.*
FROM foo
JOIN bar ON bar.id = ?
WHERE owner = ?;
WHERE owner = ?;

-- name: JoinNoConstraints :many
SELECT foo.*
FROM foo
CROSS JOIN bar
WHERE bar.id = ? AND owner = ?;
32 changes: 32 additions & 0 deletions internal/endtoend/testdata/join_where_clause/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.

8 changes: 7 additions & 1 deletion internal/endtoend/testdata/join_where_clause/postgresql/pgx/v4/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,10 @@ WHERE owner = $1;
SELECT foo.*
FROM foo
JOIN bar ON bar.id = $2
WHERE owner = $1;
WHERE owner = $1;

-- name: JoinNoConstraints :many
SELECT foo.*
FROM foo
CROSS JOIN bar
WHERE bar.id = $2 AND owner = $1;
32 changes: 32 additions & 0 deletions internal/endtoend/testdata/join_where_clause/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.

8 changes: 7 additions & 1 deletion internal/endtoend/testdata/join_where_clause/postgresql/pgx/v5/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,10 @@ WHERE owner = $1;
SELECT foo.*
FROM foo
JOIN bar ON bar.id = $2
WHERE owner = $1;
WHERE owner = $1;

-- name: JoinNoConstraints :many
SELECT foo.*
FROM foo
CROSS JOIN bar
WHERE bar.id = $2 AND owner = $1;
35 changes: 35 additions & 0 deletions internal/endtoend/testdata/join_where_clause/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.

8 changes: 7 additions & 1 deletion internal/endtoend/testdata/join_where_clause/postgresql/stdlib/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,10 @@ WHERE owner = $1;
SELECT foo.*
FROM foo
JOIN bar ON bar.id = $2
WHERE owner = $1;
WHERE owner = $1;

-- name: JoinNoConstraints :many
SELECT foo.*
FROM foo
CROSS JOIN bar
WHERE bar.id = $2 AND owner = $1;
35 changes: 35 additions & 0 deletions internal/endtoend/testdata/join_where_clause/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.

8 changes: 7 additions & 1 deletion internal/endtoend/testdata/join_where_clause/sqlite/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,10 @@ WHERE owner = ?;
SELECT foo.*
FROM foo
JOIN bar ON bar.id = ?
WHERE owner = ?;
WHERE owner = ?;

-- name: JoinNoConstraints :many
SELECT foo.*
FROM foo
CROSS JOIN bar
WHERE bar.id = ? AND owner = ?;
6 changes: 3 additions & 3 deletions internal/engine/sqlite/parser/SQLiteParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ select_stmt:
;

join_clause:
table_or_subquery (join_operator table_or_subquery join_constraint?)*
table_or_subquery (join_operator table_or_subquery join_constraint)*
;

select_core:
Expand Down Expand Up @@ -454,8 +454,8 @@ join_operator:
;

join_constraint:
ON_ expr
| USING_ OPEN_PAR column_name ( COMMA column_name)* CLOSE_PAR
(ON_ expr
| USING_ OPEN_PAR column_name ( COMMA column_name)* CLOSE_PAR)?
;

compound_operator:
Expand Down
2 changes: 1 addition & 1 deletion internal/engine/sqlite/parser/SQLiteParser.interp
View file
Open in desktop

Large diffs are not rendered by default.

Loading