Merge pull request #334 from mindsdb/planner-improvents

Planner improvements

Author: ea-rus

mindsdb_sql/__about__.py

@@ -1,6 +1,6 @@
 __title__ = 'mindsdb_sql'
 __package_name__ = 'mindsdb_sql'
-__version__ = '0.9.0'
+__version__ = '0.10.0'
 __description__ = "Pure python SQL parser"
 __email__ = "[email protected]"
 __author__ = 'MindsDB Inc'

mindsdb_sql/parser/ast/select/native_query.py

@@ -18,4 +18,7 @@ def to_tree(self, *args, level=0, **kwargs):
                f'NativeQuery(integration={self.integration.to_string()}, query="{self.query}")'
 
     def get_string(self, *args, **kwargs):
-        return f'{self.integration.to_string()} ({self.query})'
+        return f'({self.query})'
+
+    def __repr__(self):
+        return f'{self.__class__.__name__}:{self.integration.to_string()} ({self.query})'

mindsdb_sql/parser/dialects/mindsdb/parser.py

@@ -935,13 +935,15 @@ def database_engine(self, p):
         return {'identifier':p.identifier, 'engine':engine, 'if_not_exists':p.if_not_exists_or_empty}
 
     # UNION / UNION ALL
-    @_('select UNION select')
+    @_('select UNION select',
+       'union UNION select')
     def union(self, p):
-        return Union(left=p.select0, right=p.select1, unique=True)
+        return Union(left=p[0], right=p[2], unique=True)
 
-    @_('select UNION ALL select')
+    @_('select UNION ALL select',
+       'union UNION ALL select',)
     def union(self, p):
-        return Union(left=p.select0, right=p.select1, unique=False)
+        return Union(left=p[0], right=p[3], unique=False)
 
     # tableau
     @_('LPAREN select RPAREN')
@@ -1245,8 +1247,7 @@ def result_column(self, p):
 
     @_('expr',
        'function',
-       'window_function',
-       'case')
+       'window_function')
     def result_column(self, p):
         return p[0]
 
@@ -1444,6 +1445,7 @@ def enumeration(self, p):
        'parameter',
        'constant',
        'latest',
+       'case',
        'function')
     def expr(self, p):
         return p[0]