Skip to content

Fix(scope)!: include bigquery unnest aliases in selected sources #5285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
16 changes: 13 additions & 3 deletions sqlglot/optimizer/scope.py
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ def references(self) -> t.List[t.Tuple[str, exp.Expression]]:
for expression in itertools.chain(self.derived_tables, self.udtfs):
self._references.append(
(
expression.alias,
_get_source_alias(expression),
expression if expression.args.get("pivots") else expression.unnest(),
)
)
Expand Down Expand Up @@ -785,7 +785,7 @@ def _traverse_tables(scope):
# This shouldn't be a problem once qualify_columns runs, as it adds aliases on everything.
# Until then, this means that only a single, unaliased derived table is allowed (rather,
# the latest one wins.
sources[expression.alias] = child_scope
sources[_get_source_alias(expression)] = child_scope

# append the final child_scope yielded
if child_scope:
Expand Down Expand Up @@ -825,7 +825,7 @@ def _traverse_udtfs(scope):
):
yield child_scope
top = child_scope
sources[expression.alias] = child_scope
sources[_get_source_alias(expression)] = child_scope

scope.subquery_scopes.append(top)

Expand Down Expand Up @@ -915,3 +915,13 @@ def find_in_scope(expression, expression_types, bfs=True):
the criteria was found.
"""
return next(find_all_in_scope(expression, expression_types, bfs=bfs), None)


def _get_source_alias(expression):
alias_arg = expression.args.get("alias")
alias_name = expression.alias

if not alias_name and isinstance(alias_arg, exp.TableAlias) and len(alias_arg.columns) == 1:
alias_name = alias_arg.columns[0].name

return alias_name
4 changes: 4 additions & 0 deletions tests/test_optimizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -871,6 +871,10 @@ def test_scope(self):
sql = "UPDATE tbl1 SET col = 0"
self.assertEqual(len(traverse_scope(parse_one(sql))), 0)

sql = "SELECT * FROM t LEFT JOIN UNNEST(a) AS a1 LEFT JOIN UNNEST(a1.a) AS a2"
scope = build_scope(parse_one(sql, read="bigquery"))
self.assertEqual(set(scope.selected_sources), {"t", "a1", "a2"})

@patch("sqlglot.optimizer.scope.logger")
def test_scope_warning(self, logger):
self.assertEqual(len(traverse_scope(parse_one("WITH q AS (@y) SELECT * FROM q"))), 1)
Expand Down