Fix(clickhouse): allow aliases in tuple function arguments (#1695)

* Fix(clickhouse): allow aliases in tuple function arguments * Refactor to use set * fixup * PR feedback
tobymao · May 26, 2023 · 8465a77 · 8465a77
1 parent fbf5f47
commit 8465a77
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/sqlglot/dialects/clickhouse.py b/sqlglot/dialects/clickhouse.py
@@ -64,6 +64,8 @@ class Parser(parser.Parser):
             "UNIQ": exp.ApproxDistinct.from_arg_list,
         }
 
+        FUNCTIONS_WITH_ALIASED_ARGS = {*parser.Parser.FUNCTIONS_WITH_ALIASED_ARGS, "TUPLE"}
+
         FUNCTION_PARSERS = {
             **parser.Parser.FUNCTION_PARSERS,
             "QUANTILE": lambda self: self._parse_quantile(),

diff --git a/sqlglot/parser.py b/sqlglot/parser.py
@@ -678,6 +678,8 @@ class Parser(metaclass=_Parser):
         ),
     }
 
+    FUNCTIONS_WITH_ALIASED_ARGS = {"STRUCT"}
+
     FUNCTION_PARSERS: t.Dict[str, t.Callable] = {
         "CAST": lambda self: self._parse_cast(self.STRICT_CAST),
         "CONVERT": lambda self: self._parse_convert(self.STRICT_CAST),
@@ -691,7 +693,6 @@ class Parser(metaclass=_Parser):
         "SAFE_CAST": lambda self: self._parse_cast(False),
         "STRING_AGG": lambda self: self._parse_string_agg(),
         "SUBSTRING": lambda self: self._parse_substring(),
-        "STRUCT": lambda self: self._parse_struct(),
         "TRIM": lambda self: self._parse_trim(),
         "TRY_CAST": lambda self: self._parse_cast(False),
         "TRY_CONVERT": lambda self: self._parse_convert(False),
@@ -3124,7 +3125,9 @@ def _parse_function(
                 functions = self.FUNCTIONS
 
             function = functions.get(upper)
-            args = self._parse_csv(self._parse_lambda)
+
+            alias = upper in self.FUNCTIONS_WITH_ALIASED_ARGS
+            args = self._parse_csv(lambda: self._parse_lambda(alias=alias))
 
             if function and not anonymous:
                 this = function(args)
@@ -3795,9 +3798,6 @@ def _parse_substring(self) -> exp.Expression:
 
         return this
 
-    def _parse_struct(self) -> exp.Struct:
-        return exp.Struct.from_arg_list(self._parse_csv(lambda: self._parse_lambda(alias=True)))
-
     def _parse_trim(self) -> exp.Expression:
         # https://www.w3resource.com/sql/character-functions/trim.php
         # https://docs.oracle.com/javadb/10.8.3.0/ref/rreftrimfunc.html

diff --git a/tests/dialects/test_clickhouse.py b/tests/dialects/test_clickhouse.py
@@ -33,6 +33,9 @@ def test_clickhouse(self):
         self.validate_identity("position(haystack, needle)")
         self.validate_identity("position(haystack, needle, position)")
         self.validate_identity("CAST(x AS DATETIME)")
+        self.validate_identity(
+            'SELECT CAST(tuple(1 AS "a", 2 AS "b", 3.0 AS "c").2 AS Nullable(TEXT))'
+        )
         self.validate_identity(
             "CREATE TABLE test (id UInt8) ENGINE=AggregatingMergeTree() ORDER BY tuple()"
         )