refactored to DynamicIdentifier approach

Author: fivetran-kwoodbeck

sqlglot/expressions/core.py

@@ -1794,7 +1794,6 @@ class Identifier(Expression):
         "quoted": False,
         "global_": False,
         "temporary": False,
-        "identifier_func": False,
     }
     is_primitive = True
     _hash_raw_args = True
@@ -1808,6 +1807,10 @@ def output_name(self) -> str:
         return self.name
 
 
+class DynamicIdentifier(Expression):
+    arg_types = {"this": True}
+
+
 class Opclass(Expression):
     arg_types = {"this": True, "expression": True}
 

sqlglot/generator.py

@@ -1945,6 +1945,12 @@ def index_sql(self, expression: exp.Index) -> str:
         params = self.sql(expression, "params")
         return f"{unique}{primary}{amp}{index}{name}{table}{params}"
 
+    def dynamicidentifier_sql(self, expression: exp.DynamicIdentifier) -> str:
+        this = expression.this
+        if this and this.is_string:
+            return this.name
+        return self.func("IDENTIFIER", this)
+
     def identifier_sql(self, expression: exp.Identifier) -> str:
         text = expression.name
         lower = text.lower()

sqlglot/generators/snowflake.py

@@ -616,21 +616,8 @@ class SnowflakeGenerator(generator.Generator):
         ),
     }
 
-    def identifier_sql(self, expression: exp.Identifier) -> str:
-        if expression.args.get("identifier_func"):
-            name = super().identifier_sql(expression) if expression.quoted else expression.name
-            return self.func("IDENTIFIER", exp.Literal.string(name))
-        return super().identifier_sql(expression)
-
-    def column_sql(self, expression: exp.Column) -> str:
-        if (
-            expression.table
-            and isinstance(expression.this, exp.Identifier)
-            and expression.this.args.get("identifier_func")
-        ):
-            expression = expression.copy()
-            expression.this.set("identifier_func", False)
-        return super().column_sql(expression)
+    def dynamicidentifier_sql(self, expression: exp.DynamicIdentifier) -> str:
+        return self.func("IDENTIFIER", expression.this)
 
     def sortarray_sql(self, expression: exp.SortArray) -> str:
         asc = expression.args.get("asc")

sqlglot/parsers/snowflake.py

@@ -1123,17 +1123,7 @@ def _parse_table(
         return table
 
     def _fold_identifier_literal(self, arg: exp.Expr | None) -> exp.Expr:
-        if arg and arg.is_string:
-            inner = arg.to_py()
-            try:
-                ident = exp.maybe_parse(inner, into=exp.Identifier)
-                if isinstance(ident, exp.Identifier):
-                    ident.set("identifier_func", True)
-                    return ident
-            except Exception:
-                pass
-            return exp.Identifier(this=inner, identifier_func=True)
-        return self.expression(exp.Anonymous(this="IDENTIFIER", expressions=[arg]))
+        return self.expression(exp.DynamicIdentifier(this=arg))
 
     def _parse_identifier_function(self) -> exp.Expr:
         arg = self._parse_string() or super()._parse_id_var()