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
sqlc-dev · Aug 30, 2023 · e0353d3 · e0353d3
1 parent 70aac26
commit e0353d3
Show file tree

Hide file tree

Showing 16 changed files with 268 additions and 37 deletions.
diff --git a/examples/booktest/sqlite/db_test.go b/examples/booktest/sqlite/db_test.go
@@ -146,7 +146,7 @@ func TestBooks(t *testing.T) {
 		t.Fatal(err)
 	}
 	for _, ab := range res {
-		t.Logf("Book %d: '%s', Author: '%s', ISBN: '%s' Tag: '%v'\n", ab.BookID, ab.Title, ab.Name, ab.Isbn, ab.Tag)
+		t.Logf("Book %d: '%s', Author: '%s', ISBN: '%s' Tag: '%v'\n", ab.BookID, ab.Title, ab.Name.String, ab.Isbn, ab.Tag)
 	}
 
 	// TODO: call say_hello(varchar)

diff --git a/examples/booktest/sqlite/query.sql.go b/examples/booktest/sqlite/query.sql.go
diff --git a/internal/endtoend/testdata/full_outer_join/sqlite/go/query.sql.go b/internal/endtoend/testdata/full_outer_join/sqlite/go/query.sql.go
diff --git a/internal/endtoend/testdata/join_left/sqlite/go/query.sql.go b/internal/endtoend/testdata/join_left/sqlite/go/query.sql.go
diff --git a/internal/endtoend/testdata/join_left_same_table/sqlite/go/query.sql.go b/internal/endtoend/testdata/join_left_same_table/sqlite/go/query.sql.go
diff --git a/internal/endtoend/testdata/join_where_clause/mysql/go/query.sql.go b/internal/endtoend/testdata/join_where_clause/mysql/go/query.sql.go
diff --git a/internal/endtoend/testdata/join_where_clause/mysql/query.sql b/internal/endtoend/testdata/join_where_clause/mysql/query.sql
@@ -6,3 +6,9 @@ SELECT foo.*
 FROM foo
 JOIN bar ON bar.id = barid
 WHERE owner = ?;
+
+-- name: JoinParamWhereClause :many
+SELECT foo.*
+FROM foo
+JOIN bar ON bar.id = ?
+WHERE owner = ?;
diff --git a/internal/endtoend/testdata/join_where_clause/postgresql/pgx/v4/go/query.sql.go b/internal/endtoend/testdata/join_where_clause/postgresql/pgx/v4/go/query.sql.go
diff --git a/internal/endtoend/testdata/join_where_clause/postgresql/pgx/v4/query.sql b/internal/endtoend/testdata/join_where_clause/postgresql/pgx/v4/query.sql
@@ -6,3 +6,9 @@ SELECT foo.*
 FROM foo
 JOIN bar ON bar.id = barid
 WHERE owner = $1;
+
+-- name: JoinParamWhereClause :many
+SELECT foo.*
+FROM foo
+JOIN bar ON bar.id = $2
+WHERE owner = $1;
diff --git a/internal/endtoend/testdata/join_where_clause/postgresql/pgx/v5/go/query.sql.go b/internal/endtoend/testdata/join_where_clause/postgresql/pgx/v5/go/query.sql.go
diff --git a/internal/endtoend/testdata/join_where_clause/postgresql/pgx/v5/query.sql b/internal/endtoend/testdata/join_where_clause/postgresql/pgx/v5/query.sql
@@ -6,3 +6,9 @@ SELECT foo.*
 FROM foo
 JOIN bar ON bar.id = barid
 WHERE owner = $1;
+
+-- name: JoinParamWhereClause :many
+SELECT foo.*
+FROM foo
+JOIN bar ON bar.id = $2
+WHERE owner = $1;
diff --git a/internal/endtoend/testdata/join_where_clause/postgresql/stdlib/go/query.sql.go b/internal/endtoend/testdata/join_where_clause/postgresql/stdlib/go/query.sql.go
diff --git a/internal/endtoend/testdata/join_where_clause/postgresql/stdlib/query.sql b/internal/endtoend/testdata/join_where_clause/postgresql/stdlib/query.sql
@@ -6,3 +6,9 @@ SELECT foo.*
 FROM foo
 JOIN bar ON bar.id = barid
 WHERE owner = $1;
+
+-- name: JoinParamWhereClause :many
+SELECT foo.*
+FROM foo
+JOIN bar ON bar.id = $2
+WHERE owner = $1;