rollback first PR update

made fix in other way.
fix tests

Author: ea-rus

mindsdb_sql_parser/parser.py

@@ -210,11 +210,11 @@ def create_agent(self, p):
             params=params,
             if_not_exists=p.if_not_exists_or_empty
         )
-    
+
     @_('DROP AGENT if_exists_or_empty identifier')
     def drop_agent(self, p):
         return DropAgent(name=p.identifier, if_exists=p.if_exists_or_empty)
-    
+
     @_('UPDATE AGENT identifier SET kw_parameter_list')
     @_('ALTER AGENT identifier USING kw_parameter_list')
     def update_agent(self, p):
@@ -667,11 +667,13 @@ def update(self, p):
                       from_select=p.select)
 
     # INSERT
-    @_('INSERT INTO identifier LPAREN column_list RPAREN union',
+    @_('INSERT INTO identifier LPAREN column_list RPAREN select',
+       'INSERT INTO identifier LPAREN column_list RPAREN union',
+       'INSERT INTO identifier select',
        'INSERT INTO identifier union')
     def insert(self, p):
         columns = getattr(p, 'column_list', None)
-        query = p.union
+        query = p.select if hasattr(p, 'select') else p.union
         return Insert(table=p.identifier, columns=columns, from_select=query)
 
     @_('INSERT INTO identifier LPAREN column_list RPAREN VALUES expr_list_set',
@@ -1084,47 +1086,59 @@ def database_engine(self, p):
         return {'identifier':p.identifier, 'engine':engine, 'if_not_exists':p.if_not_exists_or_empty}
 
     # Combining
-    @_('union UNION select',
+    @_('select UNION select',
+       'union UNION select',
+       'select UNION ALL select',
        'union UNION ALL select',
+       'select UNION DISTINCT select',
        'union UNION DISTINCT select')
     def union(self, p):
         unique = not hasattr(p, 'ALL')
         distinct_key = hasattr(p, 'DISTINCT')
         return Union(left=p[0], right=p[-1], unique=unique, distinct_key=distinct_key)
 
-    @_('union INTERSECT select',
+    @_('select INTERSECT select',
+       'union INTERSECT select',
+       'select INTERSECT ALL select',
        'union INTERSECT ALL select',
+       'select INTERSECT DISTINCT select',
        'union INTERSECT DISTINCT select')
     def union(self, p):
         unique = not hasattr(p, 'ALL')
         distinct_key = hasattr(p, 'DISTINCT')
         return Intersect(left=p[0], right=p[-1], unique=unique, distinct_key=distinct_key)
 
-    @_('union EXCEPT select',
+    @_('select EXCEPT select',
+       'union EXCEPT select',
+       'select EXCEPT ALL select',
        'union EXCEPT ALL select',
+       'select EXCEPT DISTINCT select',
        'union EXCEPT DISTINCT select')
     def union(self, p):
         unique = not hasattr(p, 'ALL')
         distinct_key = hasattr(p, 'DISTINCT')
         return Except(left=p[0], right=p[-1], unique=unique, distinct_key=distinct_key)
 
-    @_('select')
-    def union(self, p):
-        return p[0]
-
     # tableau
     @_('LPAREN select RPAREN')
     def select(self, p):
         return p[1]
 
+    @_('LPAREN union RPAREN')
+    def union(self, p):
+        node = p[1]
+        node.parentheses = True
+        return node
+
     # WITH
     @_('ctes select')
     def select(self, p):
         select = p.select
         select.cte = p.ctes
         return select
 
-    @_('ctes COMMA identifier cte_columns_or_nothing AS LPAREN union RPAREN')
+    @_('ctes COMMA identifier cte_columns_or_nothing AS LPAREN select RPAREN',
+       'ctes COMMA identifier cte_columns_or_nothing AS LPAREN union RPAREN')
     def ctes(self, p):
         ctes = p.ctes
         ctes = ctes + [
@@ -1135,7 +1149,8 @@ def ctes(self, p):
         ]
         return ctes
 
-    @_('WITH identifier cte_columns_or_nothing AS LPAREN union RPAREN')
+    @_('WITH identifier cte_columns_or_nothing AS LPAREN select RPAREN',
+       'WITH identifier cte_columns_or_nothing AS LPAREN union RPAREN')
     def ctes(self, p):
         return [
             CommonTableExpression(
@@ -1508,11 +1523,12 @@ def window(self, p):
 
     # OPERATIONS
 
-    @_('LPAREN union RPAREN')
+    @_('LPAREN select RPAREN',
+       'LPAREN union RPAREN')
     def expr(self, p):
-        union = p.union
-        union.parentheses = True
-        return union
+        node = p[1]
+        node.parentheses = True
+        return node
 
     @_('LPAREN expr RPAREN')
     def expr(self, p):

tests/test_base_sql/test_select_structure.py

@@ -904,37 +904,6 @@ def test_in_union(self):
         assert str(ast) == str(expected_ast)
         assert ast.to_tree() == expected_ast.to_tree()
 
-    def test_union_alias(self):
-        sql = f'''
-        SELECT * FROM (
-           (
-            SELECT col1 FROM tab1
-            UNION
-            SELECT col1 FROM tab2
-           )
-           UNION
-            SELECT col1 FROM tab3
-        ) AS tt
-        '''
-        ast = parse_sql(sql)
-
-        expected_ast = Select(
-            targets=[Star()],
-            from_table=Union(
-                left=Union(
-                    left=Select(targets=[Identifier('col1')], from_table=Identifier('tab1')),
-                    right=Select(targets=[Identifier('col1')], from_table=Identifier('tab2')),
-                    parentheses=True
-                ),
-                right=Select(targets=[Identifier('col1')], from_table=Identifier('tab3')),
-                parentheses=True,
-                alias=Identifier('tt')
-            )
-        )
-
-        assert str(ast) == str(expected_ast)
-        assert ast.to_tree() == expected_ast.to_tree()
-
 
 class TestSelectStructureNoSqlite:
     def test_select_from_plugins(self):

tests/test_base_sql/test_union.py

@@ -80,3 +80,33 @@ def test_union_alias(self):
         assert ast.to_tree() == expected_ast.to_tree()
         assert str(ast) == str(expected_ast)
 
+    def test_union_alias_parens(self):
+        sql = f'''
+        SELECT * FROM (
+           (
+            SELECT col1 FROM tab1
+            UNION
+            SELECT col1 FROM tab2
+           )
+           UNION
+            SELECT col1 FROM tab3
+        ) AS tt
+        '''
+        ast = parse_sql(sql)
+
+        expected_ast = Select(
+            targets=[Star()],
+            from_table=Union(
+                left=Union(
+                    left=Select(targets=[Identifier('col1')], from_table=Identifier('tab1')),
+                    right=Select(targets=[Identifier('col1')], from_table=Identifier('tab2')),
+                    parentheses=True
+                ),
+                right=Select(targets=[Identifier('col1')], from_table=Identifier('tab3')),
+                parentheses=True,
+                alias=Identifier('tt')
+            )
+        )
+
+        assert str(ast) == str(expected_ast)
+        assert ast.to_tree() == expected_ast.to_tree()