Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions sqlglot/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -4400,10 +4400,13 @@ def _parse_column_as_identifier() -> exp.Expr | None:
return self._parse_wrapped_csv(_parse_column_as_identifier, optional=True)

def _parse_join(
self, skip_join_token: bool = False, parse_bracket: bool = False
self,
skip_join_token: bool = False,
parse_bracket: bool = False,
alias_tokens: t.Collection[TokenType] | None = None,
) -> exp.Join | None:
if self._match(TokenType.COMMA):
table = self._try_parse(self._parse_table)
table = self._try_parse(lambda: self._parse_table(alias_tokens=alias_tokens))
cross_join = self.expression(exp.Join(this=table)) if table else None

if cross_join and self.JOINS_HAVE_EQUAL_PRECEDENCE:
Expand All @@ -4430,10 +4433,12 @@ def _parse_join(
if not skip_join_token and not join and not outer_apply and not cross_apply:
return None

kwargs: dict[str, t.Any] = {"this": self._parse_table(parse_bracket=parse_bracket)}
kwargs: dict[str, t.Any] = {
"this": self._parse_table(parse_bracket=parse_bracket, alias_tokens=alias_tokens)
}
if kind and kind.token_type == TokenType.ARRAY and self._match(TokenType.COMMA):
kwargs["expressions"] = self._parse_csv(
lambda: self._parse_table(parse_bracket=parse_bracket)
lambda: self._parse_table(parse_bracket=parse_bracket, alias_tokens=alias_tokens)
)

if method:
Expand All @@ -4459,7 +4464,7 @@ def _parse_join(
and not (kind and kind.token_type in (TokenType.CROSS, TokenType.ARRAY))
):
index = self._index
joins: list | None = list(self._parse_joins())
joins: list | None = list(self._parse_joins(alias_tokens=alias_tokens))

if joins and self._match(TokenType.ON):
kwargs["on"] = self._parse_disjunction()
Expand Down Expand Up @@ -4860,7 +4865,7 @@ def _parse_table(
this.set("version", self._parse_version())

if joins:
for join in self._parse_joins():
for join in self._parse_joins(alias_tokens=alias_tokens):
this.append("joins", join)

if self._match_pair(TokenType.WITH, TokenType.ORDINALITY):
Expand Down Expand Up @@ -5056,8 +5061,10 @@ def _parse_pivots(self) -> list[exp.Pivot] | None:
return None
return list(iter(self._parse_pivot, None)) or None

def _parse_joins(self) -> t.Iterator[exp.Join]:
return iter(self._parse_join, None)
def _parse_joins(
self, alias_tokens: t.Collection[TokenType] | None = None
) -> t.Iterator[exp.Join]:
return iter(lambda: self._parse_join(alias_tokens=alias_tokens), None)

def _parse_unpivot_columns(self) -> exp.UnpivotColumns | None:
if not self._match(TokenType.INTO):
Expand Down
9 changes: 7 additions & 2 deletions sqlglot/parsers/clickhouse.py
Original file line number Diff line number Diff line change
Expand Up @@ -663,9 +663,14 @@ def _parse_join_parts(
return is_global, side or kind, kind_pre or kind

def _parse_join(
self, skip_join_token: bool = False, parse_bracket: bool = False
self,
skip_join_token: bool = False,
parse_bracket: bool = False,
alias_tokens: t.Collection[TokenType] | None = None,
) -> exp.Join | None:
join = super()._parse_join(skip_join_token=skip_join_token, parse_bracket=True)
join = super()._parse_join(
skip_join_token=skip_join_token, parse_bracket=True, alias_tokens=alias_tokens
)
if join:
method = join.args.get("method")
join.set("method", None)
Expand Down
7 changes: 7 additions & 0 deletions tests/dialects/test_mysql.py
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,13 @@ def test_ddl(self):
self.validate_identity(
"UPDATE foo JOIN bar ON TRUE SET foo.a = bar.a WHERE foo.id = bar.id"
)
self.validate_identity(
"UPDATE items, month SET items.price = month.price WHERE items.id = month.id"
)
self.validate_identity("UPDATE a CROSS JOIN b SET a.x = 1")
self.validate_identity(
"UPDATE a, b LEFT JOIN c ON b.id = c.id SET a.x = 1, b.y = 2, c.z = 3"
)

# PARTITION BY RANGE - simple column
self.validate_identity(
Expand Down
Loading