moved the FROM clause before query

Author: MinuraPunchihewa

mindsdb_sql_parser/ast/mindsdb/alter_view.py

@@ -42,8 +42,8 @@ def to_tree(self, *args, level=0, **kwargs):
         return out_str
 
     def get_string(self, *args, **kwargs):
-        from_str = f' FROM {str(self.from_table)} ' if self.from_table else ''
+        from_str = f' FROM {str(self.from_table)}' if self.from_table else ''
 
-        out_str = f'ALTER VIEW {self.name.to_string()} AS ( {self.query_str} ){from_str}'
+        out_str = f'ALTER VIEW {self.name.to_string()}{from_str} AS ( {self.query_str} )'
 
         return out_str

mindsdb_sql_parser/parser.py

@@ -693,8 +693,8 @@ def create_view(self, p):
                           if_not_exists=p.if_not_exists_or_empty)
 
     # ALTER VIEW
-    @_('ALTER VIEW identifier AS LPAREN raw_query RPAREN create_view_from_table_or_nothing',
-       'ALTER VIEW identifier LPAREN raw_query RPAREN create_view_from_table_or_nothing')
+    @_('ALTER VIEW identifier create_view_from_table_or_nothing AS LPAREN raw_query RPAREN',
+       'ALTER VIEW identifier create_view_from_table_or_nothing LPAREN raw_query RPAREN')
     def alter_view(self, p):
         query_str = tokens_to_string(p.raw_query)
 

tests/test_mindsdb/test_views.py

@@ -35,7 +35,7 @@ def test_create_view_nofrom(self):
         assert ast.to_tree() == expected_ast.to_tree()
 
     def test_alter_view_full(self):
-        sql = "ALTER VIEW my_view AS ( SELECT * FROM pred ) FROM integr"
+        sql = "ALTER VIEW my_view FROM integr AS ( SELECT * FROM pred )"
         ast = parse_sql(sql)
         expected_ast = AlterView(
             name=Identifier('my_view'),