fix(engine/sqlite): fixed IN operator precedence (#2428)

* fix(engine/sqlite): fixed IN operator precedence close #2368 * test: add endtoend * chore: v1.19.1 * Regenerate parser --------- Co-authored-by: Kyle Conroy <[email protected]>
sqlc-dev · Jul 24, 2023 · 5ffe722 · 5ffe722
1 parent 6d3cdc2
commit 5ffe722
Show file tree

Hide file tree

Showing 8 changed files with 351 additions and 205 deletions.
diff --git a/internal/endtoend/testdata/select_in_and/sqlite/go/db.go b/internal/endtoend/testdata/select_in_and/sqlite/go/db.go
diff --git a/internal/endtoend/testdata/select_in_and/sqlite/go/models.go b/internal/endtoend/testdata/select_in_and/sqlite/go/models.go
diff --git a/internal/endtoend/testdata/select_in_and/sqlite/go/query.sql.go b/internal/endtoend/testdata/select_in_and/sqlite/go/query.sql.go
diff --git a/internal/endtoend/testdata/select_in_and/sqlite/query.sql b/internal/endtoend/testdata/select_in_and/sqlite/query.sql
@@ -0,0 +1,41 @@
+-- Example queries for sqlc
+CREATE TABLE authors (
+  id   integer PRIMARY KEY,
+  name text      NOT NULL,
+  age  integer
+);
+
+CREATE TABLE translators (
+  id   integer PRIMARY KEY,
+  name text      NOT NULL,
+  age  integer
+);
+
+CREATE TABLE books (
+  id   integer PRIMARY KEY,
+  author text      NOT NULL,
+  translator text      NOT NULL,
+  year  integer
+);
+
+-- name: DeleteAuthor :exec
+DELETE FROM
+  books AS b
+WHERE
+  b.author NOT IN (
+    SELECT
+      a.name
+    FROM
+      authors a
+    WHERE
+      a.age >= ?
+  )
+  AND b.translator NOT IN (
+    SELECT
+      t.name
+    FROM
+      translators t
+    WHERE
+      t.age >= ?
+  )
+  AND b.year <= ?;
diff --git a/internal/endtoend/testdata/select_in_and/sqlite/sqlc.json b/internal/endtoend/testdata/select_in_and/sqlite/sqlc.json
@@ -0,0 +1 @@
+{"version": "1", "packages": [{"path": "go", "engine": "sqlite", "schema": "query.sql", "queries": "query.sql", "name": "querytest"}]}
diff --git a/internal/engine/sqlite/parser/SQLiteParser.g4 b/internal/engine/sqlite/parser/SQLiteParser.g4
@@ -299,6 +299,11 @@ expr:
         | MATCH_
         | REGEXP_
     ) expr #expr_comparison
+    | expr NOT_? IN_ (
+        OPEN_PAR (select_stmt | expr ( COMMA expr)*)? CLOSE_PAR
+        | ( schema_name DOT)? table_name
+        | (schema_name DOT)? table_function_name OPEN_PAR (expr (COMMA expr)*)? CLOSE_PAR
+    ) #expr_in_select
     | expr AND_ expr #expr_binary
     | expr OR_ expr #expr_binary
     | qualified_function_name OPEN_PAR ((DISTINCT_? expr ( COMMA expr)*) | STAR)? CLOSE_PAR filter_clause? over_clause? #expr_function
@@ -310,11 +315,6 @@ expr:
     )? #expr_comparison
     | expr ( ISNULL_ | NOTNULL_ | NOT_ NULL_) #expr_null_comp
     | expr NOT_? BETWEEN_ expr AND_ expr #expr_between
-    | expr NOT_? IN_ (
-        OPEN_PAR (select_stmt | expr ( COMMA expr)*)? CLOSE_PAR
-        | ( schema_name DOT)? table_name
-        | (schema_name DOT)? table_function_name OPEN_PAR (expr (COMMA expr)*)? CLOSE_PAR
-    ) #expr_in_select
     | ((NOT_)? EXISTS_)? OPEN_PAR select_stmt CLOSE_PAR #expr_in_select
     | CASE_ expr? (WHEN_ expr THEN_ expr)+ (ELSE_ expr)? END_ #expr_case
     | raise_function #expr_raise

diff --git a/internal/engine/sqlite/parser/SQLiteParser.interp b/internal/engine/sqlite/parser/SQLiteParser.interp
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"version": "1", "packages": [{"path": "go", "engine": "sqlite", "schema": "query.sql", "queries": "query.sql", "name": "querytest"}]}