Skip to content

Commit e465d0b

Browse files
orisanoorisano
authored
fix(engine/sqlite): fix grammer to avoid missing join_constraint (#2732)
close #2729 ANTLR's API has difficulty handling the case where there is no join_constraint corresponding to join_operator in join_clause, so an empty join_constraint is accepted. It is defined as such in the sqlite documentation. https://www.sqlite.org/syntax/join-clause.html https://www.sqlite.org/syntax/join-constraint.html
1 parent 79cb8b5 commit e465d0b

File tree

13 files changed

+1328
-1141
lines changed

13 files changed

+1328
-1141
lines changed

‎internal/endtoend/testdata/join_where_clause/mysql/go/query.sql.go‎

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

‎internal/endtoend/testdata/join_where_clause/mysql/query.sql‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,10 @@ WHERE owner = ?;
1111
SELECT foo.*
1212
FROM foo
1313
JOIN bar ON bar.id = ?
14-
WHERE owner = ?;
14+
WHERE owner = ?;
15+
16+
-- name: JoinNoConstraints :many
17+
SELECT foo.*
18+
FROM foo
19+
CROSS JOIN bar
20+
WHERE bar.id = ? AND owner = ?;

‎internal/endtoend/testdata/join_where_clause/postgresql/pgx/v4/go/query.sql.go‎

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

‎internal/endtoend/testdata/join_where_clause/postgresql/pgx/v4/query.sql‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,10 @@ WHERE owner = $1;
1111
SELECT foo.*
1212
FROM foo
1313
JOIN bar ON bar.id = $2
14-
WHERE owner = $1;
14+
WHERE owner = $1;
15+
16+
-- name: JoinNoConstraints :many
17+
SELECT foo.*
18+
FROM foo
19+
CROSS JOIN bar
20+
WHERE bar.id = $2 AND owner = $1;

‎internal/endtoend/testdata/join_where_clause/postgresql/pgx/v5/go/query.sql.go‎

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

‎internal/endtoend/testdata/join_where_clause/postgresql/pgx/v5/query.sql‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,10 @@ WHERE owner = $1;
1111
SELECT foo.*
1212
FROM foo
1313
JOIN bar ON bar.id = $2
14-
WHERE owner = $1;
14+
WHERE owner = $1;
15+
16+
-- name: JoinNoConstraints :many
17+
SELECT foo.*
18+
FROM foo
19+
CROSS JOIN bar
20+
WHERE bar.id = $2 AND owner = $1;

‎internal/endtoend/testdata/join_where_clause/postgresql/stdlib/go/query.sql.go‎

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

‎internal/endtoend/testdata/join_where_clause/postgresql/stdlib/query.sql‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,10 @@ WHERE owner = $1;
1111
SELECT foo.*
1212
FROM foo
1313
JOIN bar ON bar.id = $2
14-
WHERE owner = $1;
14+
WHERE owner = $1;
15+
16+
-- name: JoinNoConstraints :many
17+
SELECT foo.*
18+
FROM foo
19+
CROSS JOIN bar
20+
WHERE bar.id = $2 AND owner = $1;

‎internal/endtoend/testdata/join_where_clause/sqlite/go/query.sql.go‎

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

‎internal/endtoend/testdata/join_where_clause/sqlite/query.sql‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,10 @@ WHERE owner = ?;
1111
SELECT foo.*
1212
FROM foo
1313
JOIN bar ON bar.id = ?
14-
WHERE owner = ?;
14+
WHERE owner = ?;
15+
16+
-- name: JoinNoConstraints :many
17+
SELECT foo.*
18+
FROM foo
19+
CROSS JOIN bar
20+
WHERE bar.id = ? AND owner = ?;

0 commit comments

Comments
 (0)