Skip to content

Commit e0353d3

Browse files
authored
fix(engine/sqlite): Fix to handle join clauses correctly (#2674)
* fix(engine/sqlite): Fix to handle join clauses correctly close #2657 * test: update endtoend * test: update example
1 parent 70aac26 commit e0353d3

File tree

16 files changed

+268
-37
lines changed

16 files changed

+268
-37
lines changed

examples/booktest/sqlite/db_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func TestBooks(t *testing.T) {
146146
t.Fatal(err)
147147
}
148148
for _, ab := range res {
149-
t.Logf("Book %d: '%s', Author: '%s', ISBN: '%s' Tag: '%v'\n", ab.BookID, ab.Title, ab.Name, ab.Isbn, ab.Tag)
149+
t.Logf("Book %d: '%s', Author: '%s', ISBN: '%s' Tag: '%v'\n", ab.BookID, ab.Title, ab.Name.String, ab.Isbn, ab.Tag)
150150
}
151151

152152
// TODO: call say_hello(varchar)

examples/booktest/sqlite/query.sql.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

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

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

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

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

Lines changed: 3 additions & 2 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/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: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,9 @@ SELECT foo.*
66
FROM foo
77
JOIN bar ON bar.id = barid
88
WHERE owner = ?;
9+
10+
-- name: JoinParamWhereClause :many
11+
SELECT foo.*
12+
FROM foo
13+
JOIN bar ON bar.id = ?
14+
WHERE 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: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,9 @@ SELECT foo.*
66
FROM foo
77
JOIN bar ON bar.id = barid
88
WHERE owner = $1;
9+
10+
-- name: JoinParamWhereClause :many
11+
SELECT foo.*
12+
FROM foo
13+
JOIN bar ON bar.id = $2
14+
WHERE 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: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,9 @@ SELECT foo.*
66
FROM foo
77
JOIN bar ON bar.id = barid
88
WHERE owner = $1;
9+
10+
-- name: JoinParamWhereClause :many
11+
SELECT foo.*
12+
FROM foo
13+
JOIN bar ON bar.id = $2
14+
WHERE 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: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,9 @@ SELECT foo.*
66
FROM foo
77
JOIN bar ON bar.id = barid
88
WHERE owner = $1;
9+
10+
-- name: JoinParamWhereClause :many
11+
SELECT foo.*
12+
FROM foo
13+
JOIN bar ON bar.id = $2
14+
WHERE owner = $1;

0 commit comments

Comments
 (0)