Merge pull request #5 from puzzleYOU/nesting-correction-station

florianschieder · web-flow · commit 243eb5bdcabd · 2026-04-10T09:20:36.000+02:00
Do not treat parentheses as special characters when parsing inner query
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -2,7 +2,7 @@ name: publish to PyPI
 
 on:
   release:
-    types: [published]
+    types: ["published", "created", "released"]
 
 jobs:
   deploy:
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "sqlquerypp"
-version = "0.1.0a5"
+version = "0.1.0a6"
 description = "SQL query preprocessor for generating optimized queries"
 readme = "README.md"
 repository = "https://github.com/puzzleYOU/sqlquerypp"
diff --git a/python/tests/expected_queries/mysql84/test_combined_result/test_with_multiple_parameters_and_union_fragments.sql b/python/tests/expected_queries/mysql84/test_combined_result/test_with_multiple_parameters_and_union_fragments.sql
@@ -15,7 +15,7 @@
     b.col_b2
   FROM
     table_a AS a
-    LEFT JOIN table_b AS b ON b.col_a1 = a.col_a1 AND b.cond1 = %s AND b.cond2 = %s
+    LEFT JOIN table_b AS b ON b.col_a1 = a.col_a1 AND b.cond1 = %s AND b.cond2 = %s AND b.rangecond IN ('a', 'b')
   WHERE
     a.col_a1 = (SELECT * FROM loop_values LIMIT 1)
   UNION ALL
@@ -28,7 +28,7 @@
   FROM
     all_entries
     LEFT JOIN table_a AS a ON a.col_a1 = (SELECT col_a1 FROM loop_values WHERE col_a1 > all_entries.col_a1 LIMIT 1)
-    LEFT JOIN table_b AS b ON b.col_a1 = a.col_a1 AND b.cond1 = %s AND b.cond2 = %s
+    LEFT JOIN table_b AS b ON b.col_a1 = a.col_a1 AND b.cond1 = %s AND b.cond2 = %s AND b.rangecond IN ('a', 'b')
   WHERE
     n + 1 < (SELECT COUNT(*) FROM loop_values)
 )
@@ -59,7 +59,7 @@ UNION ALL
     b.col_b2
   FROM
     table_a AS a
-    LEFT JOIN table_b AS b ON b.col_a1 = a.col_a1 AND b.cond3 = %s AND b.cond4 = %s
+    LEFT JOIN table_b AS b ON b.col_a1 = a.col_a1 AND b.cond3 = %s AND b.cond4 = %s AND b.rangecond IN ('a', 'b')
   WHERE
     a.col_a1 = (SELECT * FROM loop_values LIMIT 1)
   UNION ALL
@@ -72,7 +72,7 @@ UNION ALL
   FROM
     all_entries
     LEFT JOIN table_a AS a ON a.col_a1 = (SELECT col_a1 FROM loop_values WHERE col_a1 > all_entries.col_a1 LIMIT 1)
-    LEFT JOIN table_b AS b ON b.col_a1 = a.col_a1 AND b.cond3 = %s AND b.cond4 = %s
+    LEFT JOIN table_b AS b ON b.col_a1 = a.col_a1 AND b.cond3 = %s AND b.cond4 = %s AND b.rangecond IN ('a', 'b')
   WHERE
     n + 1 < (SELECT COUNT(*) FROM loop_values)
 )
diff --git a/python/tests/mysql84/test_combined_result.py b/python/tests/mysql84/test_combined_result.py
@@ -18,6 +18,7 @@ def test_with_multiple_parameters_and_union_fragments(self) -> None:
                 ON b.col_a1 = a.col_a1
                 AND b.cond1 = %s
                 AND b.cond2 = %s
+                AND b.rangecond IN ('a', 'b')
                 WHERE a.col_a1 = $id
             }
             UNION ALL
@@ -29,6 +30,7 @@ def test_with_multiple_parameters_and_union_fragments(self) -> None:
                 ON b.col_a1 = a.col_a1
                 AND b.cond3 = %s
                 AND b.cond4 = %s
+                AND b.rangecond IN ('a', 'b')
                 WHERE a.col_a1 = $id
             }
             """,
diff --git a/src/parser/state.rs b/src/parser/state.rs
@@ -20,6 +20,7 @@ pub struct ParserState<'t> {
     statement: &'t String,
     seen_token_state: Option<TokenState>,
     combined_result_nodes_state: NodesState<CombinedResultNode>,
+    visiting_inner_query: bool,
     offset: usize,
 }
 
@@ -34,6 +35,7 @@ impl<'t> ParserState<'t> {
         Self { statement,
                seen_token_state: None,
                combined_result_nodes_state: NodesState::new(),
+               visiting_inner_query: false,
                offset: 0 }
     }
 
@@ -180,7 +182,8 @@ impl<'t> ParserState<'t> {
             },
 
             (_, TokenState::OpeningParenthese(offset))
-                if handles_combined_result_node =>
+                if handles_combined_result_node
+                   && !self.visiting_inner_query =>
             {
                 self.attach_iteration_query(*offset + 1)?
             },
@@ -194,12 +197,14 @@ impl<'t> ParserState<'t> {
             (_, TokenState::OpeningBrace(offset))
                 if handles_combined_result_node =>
             {
+                self.visiting_inner_query = true;
                 self.mark_inner_query_begin(*offset)?
             },
 
             (_, TokenState::ClosingBrace(offset))
                 if handles_combined_result_node =>
             {
+                self.visiting_inner_query = false;
                 self.finalize_combined_result_node(offset)
             },
 
