fix tests

Author: StpMax

mindsdb_sql_parser/ast/select/identifier.py

@@ -45,7 +45,10 @@ def get_reserved_words() -> set[str]:
 
 
 class Identifier(ASTNode):
-    def __init__(self, path_str=None, parts=None, is_outer=False, with_rollup=False, *args, **kwargs):
+    def __init__(
+            self, path_str=None, parts=None, is_outer=False, with_rollup=False,
+            is_quoted: list[bool] | None = None, *args, **kwargs
+    ):
         super().__init__(*args, **kwargs)
         assert path_str or parts, "Either path_str or parts must be provided for an Identifier"
         assert not (path_str and parts), "Provide either path_str or parts, but not both"
@@ -54,7 +57,7 @@ def __init__(self, path_str=None, parts=None, is_outer=False, with_rollup=False,
 
         if path_str and not parts:
             parts, is_quoted = path_str_to_parts(path_str)
-        else:
+        elif is_quoted is None:
             is_quoted = [False] * len(parts)
         assert isinstance(parts, list)
         self.parts = parts
@@ -73,8 +76,7 @@ def append(self, other: "Identifier") -> None:
         self.parts += other.parts
         self.is_quoted += other.is_quoted
 
-    def parts_to_str(self):
-        out_parts = []
+    def iter_parts_str(self):
         reserved_words = get_reserved_words()
         for part, is_quoted in zip(self.parts, self.is_quoted):
             if isinstance(part, Star):
@@ -86,9 +88,10 @@ def parts_to_str(self):
                     or part.upper() in reserved_words
                 ):
                     part = f'`{part}`'
+            yield part
 
-            out_parts.append(part)
-        return '.'.join(out_parts)
+    def parts_to_str(self):
+        return '.'.join(self.iter_parts_str())
 
     def to_tree(self, *args, level=0, **kwargs):
         alias_str = f', alias={self.alias.to_tree()}' if self.alias else ''

mindsdb_sql_parser/ast/show.py

@@ -53,8 +53,8 @@ def get_string(self, *args, **kwargs):
         from_str = ''
         if self.from_table:
             ar = [
-                f'FROM {i}'
-                for i in self.from_table.parts
+                f'FROM {part}'
+                for part in self.from_table.iter_parts_str()
             ]
             ar.reverse()
             from_str = ' ' + ' '.join(ar)

tests/test_base_sql/test_select_structure.py

@@ -1213,10 +1213,10 @@ def test_double_quote_render_skip(self):
         sql = 'select `KEY_ID`, `a`.* from `Table1` where `id`=2'
 
         expected_ast = Select(
-            targets=[Identifier('KEY_ID'), Identifier(parts=['a', Star()])],
-            from_table=Identifier(parts=['Table1']),
+            targets=[Identifier('`KEY_ID`'), Identifier(parts=['a', Star()], is_quoted=[True, False])],
+            from_table=Identifier(parts=['Table1'], is_quoted=[True]),
             where=BinaryOperation(op='=', args=[
-                Identifier('id'), Constant(2)
+                Identifier('`id`'), Constant(2)
             ])
         )
 

tests/test_base_sql/test_show.py

@@ -88,12 +88,12 @@ def test_from_where(self):
         assert ast.to_tree() == expected_ast.to_tree()
 
     def test_full_columns(self):
-        sql = "SHOW FULL COLUMNS FROM `concrete` FROM `files`"
+        sql = "SHOW FULL COLUMNS FROM `ccc` FROM `fff`"
         ast = parse_sql(sql)
         expected_ast = Show(
             category='COLUMNS',
             modes=['FULL'],
-            from_table=Identifier('`files`.`concrete`')
+            from_table=Identifier('`fff`.`ccc`')
         )
 
         assert str(ast) == str(expected_ast)

tests/test_mysql/test_mysql_parser.py

@@ -42,23 +42,23 @@ def test_select_varialbe_complex(self):
         assert str(ast) == str(expected_ast)
 
     def test_show_index(self):
-        sql = "SHOW INDEX FROM predictors"
+        sql = "SHOW INDEX FROM `predictors`"
         ast = parse_sql(sql)
         expected_ast = Show(
             category='INDEX',
-            from_table=Identifier('predictors')
+            from_table=Identifier('`predictors`')
         )
 
         assert str(ast).lower() == sql.lower()
         assert str(ast) == str(expected_ast)
         assert ast.to_tree() == expected_ast.to_tree()
 
     def test_show_index_from_db(self):
-        sql = "SHOW INDEX FROM predictors FROM db"
+        sql = "SHOW INDEX FROM `predictors` FROM db"
         ast = parse_sql(sql)
         expected_ast = Show(
             category='INDEX',
-            from_table=Identifier('db.predictors'),
+            from_table=Identifier('db.`predictors`'),
         )
 
         # assert str(ast).lower() == sql.lower()

tests/test_standard_render.py

@@ -82,7 +82,4 @@ def test_standard_render():
 
         # inject function
         module.parse_sql = parse_sql2
-
         check_module(module)
-
-