Fix: bigquery select distinct as struct

tobymao · May 5, 2023 · 6124d0c · 6124d0c
1 parent 34b6038
commit 6124d0c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/sqlglot/expressions.py b/sqlglot/expressions.py
@@ -2246,6 +2246,8 @@ class Select(Subqueryable):
         "expressions": False,
         "hint": False,
         "distinct": False,
+        "struct": False,  # https://cloud.google.com/bigquery/docs/reference/standard-sql/query-syntax#return_query_results_as_a_value_table
+        "value": False,
         "into": False,
         "from": False,
         **QUERY_MODIFIERS,

diff --git a/sqlglot/generator.py b/sqlglot/generator.py
@@ -1449,16 +1449,16 @@ def query_modifiers(self, expression: exp.Expression, *sqls: str) -> str:
         )
 
     def select_sql(self, expression: exp.Select) -> str:
-        kind = expression.args.get("kind")
-        kind = f" AS {kind}" if kind else ""
         hint = self.sql(expression, "hint")
         distinct = self.sql(expression, "distinct")
         distinct = f" {distinct}" if distinct else ""
+        kind = expression.args.get("kind")
+        kind = f" AS {kind}" if kind else ""
         expressions = self.expressions(expression)
         expressions = f"{self.sep()}{expressions}" if expressions else expressions
         sql = self.query_modifiers(
             expression,
-            f"SELECT{kind}{hint}{distinct}{expressions}",
+            f"SELECT{hint}{distinct}{kind}{expressions}",
             self.sql(expression, "into", comment=False),
             self.sql(expression, "from", comment=False),
         )

diff --git a/sqlglot/parser.py b/sqlglot/parser.py
@@ -1802,14 +1802,15 @@ def _parse_select(
         elif self._match(TokenType.SELECT):
             comments = self._prev_comments
 
+            hint = self._parse_hint()
+            all_ = self._match(TokenType.ALL)
+            distinct = self._match(TokenType.DISTINCT)
+
             kind = (
                 self._match(TokenType.ALIAS)
                 and self._match_texts(("STRUCT", "VALUE"))
                 and self._prev.text
             )
-            hint = self._parse_hint()
-            all_ = self._match(TokenType.ALL)
-            distinct = self._match(TokenType.DISTINCT)
 
             if distinct:
                 distinct = self.expression(

diff --git a/tests/dialects/test_bigquery.py b/tests/dialects/test_bigquery.py
@@ -11,6 +11,7 @@ def test_bigquery(self):
         )
         self.validate_identity("""SELECT * FROM UNNEST(ARRAY<STRUCT<x INT64>>[1, 2])""")
         self.validate_identity("SELECT AS STRUCT 1 AS a, 2 AS b")
+        self.validate_identity("SELECT DISTINCT AS STRUCT 1 AS a, 2 AS b")
         self.validate_identity("SELECT AS VALUE STRUCT(1 AS a, 2 AS b)")
         self.validate_identity("SELECT STRUCT<ARRAY<STRING>>(['2023-01-17'])")
         self.validate_identity("SELECT * FROM q UNPIVOT(values FOR quarter IN (b, c))")