Fix: allow joins in FROM expression parser (#3389)

tobymao · May 1, 2024 · 0d23b20 · 0d23b20
1 parent cc6259d
commit 0d23b20
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/sqlglot/parser.py b/sqlglot/parser.py
@@ -598,7 +598,7 @@ class Parser(metaclass=_Parser):
         exp.Condition: lambda self: self._parse_conjunction(),
         exp.DataType: lambda self: self._parse_types(allow_identifiers=False),
         exp.Expression: lambda self: self._parse_expression(),
-        exp.From: lambda self: self._parse_from(),
+        exp.From: lambda self: self._parse_from(joins=True),
         exp.Group: lambda self: self._parse_group(),
         exp.Having: lambda self: self._parse_having(),
         exp.Identifier: lambda self: self._parse_id_var(),

diff --git a/tests/test_build.py b/tests/test_build.py
@@ -545,6 +545,10 @@ def test_build(self):
                 lambda: exp.update("tbl", {"x": 1}, from_="tbl2"),
                 "UPDATE tbl SET x = 1 FROM tbl2",
             ),
+            (
+                lambda: exp.update("tbl", {"x": 1}, from_="tbl2 cross join tbl3"),
+                "UPDATE tbl SET x = 1 FROM tbl2 CROSS JOIN tbl3",
+            ),
             (
                 lambda: union("SELECT * FROM foo", "SELECT * FROM bla"),
                 "SELECT * FROM foo UNION SELECT * FROM bla",