Fix: ensure pivot can be used as a table name (#1734)

tobymao · Jun 6, 2023 · e058513 · e058513
1 parent a30a828
commit e058513
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/sqlglot/parser.py b/sqlglot/parser.py
@@ -1912,8 +1912,16 @@ def _parse_select(
 
             this = self._parse_query_modifiers(this)
         elif (table or nested) and self._match(TokenType.L_PAREN):
-            this = self._parse_table() if table else self._parse_select(nested=True)
-            this = self._parse_set_operations(self._parse_query_modifiers(this))
+            if self._match(TokenType.PIVOT):
+                this = self._parse_simplified_pivot()
+            elif self._match(TokenType.FROM):
+                this = exp.select("*").from_(
+                    t.cast(exp.From, self._parse_from(skip_from_token=True))
+                )
+            else:
+                this = self._parse_table() if table else self._parse_select(nested=True)
+                this = self._parse_set_operations(self._parse_query_modifiers(this))
+
             self._match_r_paren()
 
             # early return so that subquery unions aren't parsed again
@@ -1926,10 +1934,6 @@ def _parse_select(
                 expressions=self._parse_csv(self._parse_value),
                 alias=self._parse_table_alias(),
             )
-        elif self._match(TokenType.PIVOT):
-            this = self._parse_simplified_pivot()
-        elif self._match(TokenType.FROM):
-            this = exp.select("*").from_(t.cast(exp.From, self._parse_from(skip_from_token=True)))
         else:
             this = None
 

diff --git a/tests/dialects/test_bigquery.py b/tests/dialects/test_bigquery.py
@@ -6,6 +6,7 @@ class TestBigQuery(Validator):
     dialect = "bigquery"
 
     def test_bigquery(self):
+        self.validate_identity("SELECT * FROM pivot CROSS JOIN foo")
         self.validate_identity("SAFE_CAST(x AS STRING)")
         self.validate_identity("SELECT * FROM a-b-c.mydataset.mytable")
         self.validate_identity("SELECT * FROM abc-def-ghi")

diff --git a/tests/dialects/test_presto.py b/tests/dialects/test_presto.py
@@ -438,6 +438,7 @@ def test_presto(self):
         self.validate_identity("START TRANSACTION ISOLATION LEVEL REPEATABLE READ")
         self.validate_identity("APPROX_PERCENTILE(a, b, c, d)")
 
+        self.validate_all("VALUES 1, 2, 3", write={"presto": "VALUES (1), (2), (3)"})
         self.validate_all("INTERVAL '1 day'", write={"trino": "INTERVAL '1' day"})
         self.validate_all("(5 * INTERVAL '7' day)", read={"": "INTERVAL '5' week"})
         self.validate_all("(5 * INTERVAL '7' day)", read={"": "INTERVAL '5' WEEKS"})

diff --git a/tests/dialects/test_spark.py b/tests/dialects/test_spark.py
@@ -225,6 +225,9 @@ def test_spark(self):
         self.validate_identity("TRIM(TRAILING 'SL' FROM 'SSparkSQLS')")
         self.validate_identity("SPLIT(str, pattern, lim)")
 
+        self.validate_all(
+            "SELECT * FROM ((VALUES 1))", write={"spark": "SELECT * FROM (VALUES (1))"}
+        )
         self.validate_all(
             "SELECT CAST(STRUCT('fooo') AS STRUCT<a: VARCHAR(2)>)",
             write={"spark": "SELECT CAST(STRUCT('fooo') AS STRUCT<a: STRING>)"},