Fix(mysql): move parsing logic for JSON_TABLE to base parser (#2387)

tobymao · Oct 9, 2023 · a849794 · a849794
1 parent da2c6f1
commit a849794
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 24 deletions.
diff --git a/sqlglot/dialects/oracle.py b/sqlglot/dialects/oracle.py
@@ -82,7 +82,6 @@ class Parser(parser.Parser):
                 this=self._parse_format_json(self._parse_bitwise()),
                 order=self._parse_order(),
             ),
-            "JSON_TABLE": lambda self: self._parse_json_table(),
             "XMLTABLE": _parse_xml_table,
         }
 
@@ -96,29 +95,6 @@ class Parser(parser.Parser):
         # Reference: https://stackoverflow.com/a/336455
         DISTINCT_TOKENS = {TokenType.DISTINCT, TokenType.UNIQUE}
 
-        # Note: this is currently incomplete; it only implements the "JSON_value_column" part
-        def _parse_json_column_def(self) -> exp.JSONColumnDef:
-            this = self._parse_id_var()
-            kind = self._parse_types(allow_identifiers=False)
-            path = self._match_text_seq("PATH") and self._parse_string()
-            return self.expression(exp.JSONColumnDef, this=this, kind=kind, path=path)
-
-        def _parse_json_table(self) -> exp.JSONTable:
-            this = self._parse_format_json(self._parse_bitwise())
-            path = self._match(TokenType.COMMA) and self._parse_string()
-            error_handling = self._parse_on_handling("ERROR", "ERROR", "NULL")
-            empty_handling = self._parse_on_handling("EMPTY", "ERROR", "NULL")
-            self._match(TokenType.COLUMN)
-            expressions = self._parse_wrapped_csv(self._parse_json_column_def, optional=True)
-
-            return exp.JSONTable(
-                this=this,
-                expressions=expressions,
-                path=path,
-                error_handling=error_handling,
-                empty_handling=empty_handling,
-            )
-
         def _parse_json_array(self, expr_type: t.Type[E], **kwargs) -> E:
             return self.expression(
                 expr_type,

diff --git a/sqlglot/parser.py b/sqlglot/parser.py
@@ -792,6 +792,7 @@ class Parser(metaclass=_Parser):
         "DECODE": lambda self: self._parse_decode(),
         "EXTRACT": lambda self: self._parse_extract(),
         "JSON_OBJECT": lambda self: self._parse_json_object(),
+        "JSON_TABLE": lambda self: self._parse_json_table(),
         "LOG": lambda self: self._parse_logarithm(),
         "MATCH": lambda self: self._parse_match_against(),
         "OPENJSON": lambda self: self._parse_open_json(),
@@ -4347,6 +4348,29 @@ def _parse_json_object(self) -> exp.JSONObject:
             encoding=encoding,
         )
 
+    # Note: this is currently incomplete; it only implements the "JSON_value_column" part
+    def _parse_json_column_def(self) -> exp.JSONColumnDef:
+        this = self._parse_id_var()
+        kind = self._parse_types(allow_identifiers=False)
+        path = self._match_text_seq("PATH") and self._parse_string()
+        return self.expression(exp.JSONColumnDef, this=this, kind=kind, path=path)
+
+    def _parse_json_table(self) -> exp.JSONTable:
+        this = self._parse_format_json(self._parse_bitwise())
+        path = self._match(TokenType.COMMA) and self._parse_string()
+        error_handling = self._parse_on_handling("ERROR", "ERROR", "NULL")
+        empty_handling = self._parse_on_handling("EMPTY", "ERROR", "NULL")
+        self._match_text_seq("COLUMNS")
+        expressions = self._parse_wrapped_csv(self._parse_json_column_def, optional=True)
+
+        return exp.JSONTable(
+            this=this,
+            expressions=expressions,
+            path=path,
+            error_handling=error_handling,
+            empty_handling=empty_handling,
+        )
+
     def _parse_logarithm(self) -> exp.Func:
         # Default argument order is base, expression
         args = self._parse_csv(self._parse_range)

diff --git a/tests/dialects/test_mysql.py b/tests/dialects/test_mysql.py
@@ -65,6 +65,9 @@ def test_ddl(self):
         self.validate_identity(
             "INSERT INTO x VALUES (1, 'a', 2.0) ON DUPLICATE KEY UPDATE x.id = 1"
         )
+        self.validate_identity(
+            "CREATE OR REPLACE VIEW my_view AS SELECT column1 AS `boo`, column2 AS `foo` FROM my_table WHERE column3 = 'some_value' UNION SELECT q.* FROM fruits_table, JSON_TABLE(Fruits, '$[*]' COLUMNS (id VARCHAR(255) PATH '$.$id', value VARCHAR(255) PATH '$.value')) AS q",
+        )
 
         self.validate_all(
             "CREATE TABLE z (a INT) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARACTER SET=utf8 COLLATE=utf8_bin COMMENT='x'",