fix(engine/sqlite): Fix ast when using compound operator (#2673)

close #2664
sqlc-dev · Aug 30, 2023 · 70aac26 · 70aac26
1 parent 5e81d02
commit 70aac26
Show file tree

Hide file tree

Showing 20 changed files with 520 additions and 32 deletions.
diff --git a/internal/endtoend/testdata/select_union/mysql/go/models.go b/internal/endtoend/testdata/select_union/mysql/go/models.go
diff --git a/internal/endtoend/testdata/select_union/mysql/go/query.sql.go b/internal/endtoend/testdata/select_union/mysql/go/query.sql.go
diff --git a/internal/endtoend/testdata/select_union/mysql/query.sql b/internal/endtoend/testdata/select_union/mysql/query.sql
@@ -1,4 +1,5 @@
 CREATE TABLE foo (a text, b text);
+CREATE TABLE bar (a text, b text);
 
 -- name: SelectUnion :many
 SELECT * FROM foo
@@ -20,3 +21,8 @@ SELECT * FROM foo;
 SELECT * FROM foo
 INTERSECT
 SELECT * FROM foo;
+
+-- name: SelectUnionOther :many
+SELECT * FROM foo
+UNION
+SELECT * FROM bar;
diff --git a/internal/endtoend/testdata/select_union/postgres/pgx/v4/go/models.go b/internal/endtoend/testdata/select_union/postgres/pgx/v4/go/models.go
diff --git a/internal/endtoend/testdata/select_union/postgres/pgx/v4/go/query.sql.go b/internal/endtoend/testdata/select_union/postgres/pgx/v4/go/query.sql.go
diff --git a/internal/endtoend/testdata/select_union/postgres/pgx/v4/query.sql b/internal/endtoend/testdata/select_union/postgres/pgx/v4/query.sql
@@ -1,4 +1,5 @@
 CREATE TABLE foo (a text, b text);
+CREATE TABLE bar (a text, b text);
 
 -- name: SelectUnion :many
 SELECT * FROM foo
@@ -20,3 +21,8 @@ SELECT * FROM foo;
 SELECT * FROM foo
 INTERSECT
 SELECT * FROM foo;
+
+-- name: SelectUnionOther :many
+SELECT * FROM foo
+UNION
+SELECT * FROM bar;
diff --git a/internal/endtoend/testdata/select_union/postgres/pgx/v5/go/models.go b/internal/endtoend/testdata/select_union/postgres/pgx/v5/go/models.go
diff --git a/internal/endtoend/testdata/select_union/postgres/pgx/v5/go/query.sql.go b/internal/endtoend/testdata/select_union/postgres/pgx/v5/go/query.sql.go
diff --git a/internal/endtoend/testdata/select_union/postgres/pgx/v5/query.sql b/internal/endtoend/testdata/select_union/postgres/pgx/v5/query.sql
@@ -1,4 +1,5 @@
 CREATE TABLE foo (a text, b text);
+CREATE TABLE bar (a text, b text);
 
 -- name: SelectUnion :many
 SELECT * FROM foo
@@ -20,3 +21,8 @@ SELECT * FROM foo;
 SELECT * FROM foo
 INTERSECT
 SELECT * FROM foo;
+
+-- name: SelectUnionOther :many
+SELECT * FROM foo
+UNION
+SELECT * FROM bar;
diff --git a/internal/endtoend/testdata/select_union/postgres/stdlib/go/models.go b/internal/endtoend/testdata/select_union/postgres/stdlib/go/models.go
diff --git a/internal/endtoend/testdata/select_union/postgres/stdlib/go/query.sql.go b/internal/endtoend/testdata/select_union/postgres/stdlib/go/query.sql.go
diff --git a/internal/endtoend/testdata/select_union/postgres/stdlib/query.sql b/internal/endtoend/testdata/select_union/postgres/stdlib/query.sql
@@ -1,4 +1,5 @@
 CREATE TABLE foo (a text, b text);
+CREATE TABLE bar (a text, b text);
 
 -- name: SelectUnion :many
 SELECT * FROM foo
@@ -20,3 +21,8 @@ SELECT * FROM foo;
 SELECT * FROM foo
 INTERSECT
 SELECT * FROM foo;
+
+-- name: SelectUnionOther :many
+SELECT * FROM foo
+UNION
+SELECT * FROM bar;
diff --git a/internal/endtoend/testdata/select_union/sqlite/go/db.go b/internal/endtoend/testdata/select_union/sqlite/go/db.go
diff --git a/internal/endtoend/testdata/select_union/sqlite/go/models.go b/internal/endtoend/testdata/select_union/sqlite/go/models.go