diff options
Diffstat (limited to 'sqlglot/optimizer')
| -rw-r--r-- | sqlglot/optimizer/merge_subqueries.py | 2 | ||||
| -rw-r--r-- | sqlglot/optimizer/qualify_columns.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sqlglot/optimizer/merge_subqueries.py b/sqlglot/optimizer/merge_subqueries.py index 7322424..976c9ad 100644 --- a/sqlglot/optimizer/merge_subqueries.py +++ b/sqlglot/optimizer/merge_subqueries.py @@ -128,7 +128,7 @@ def _mergeable(outer_scope, inner_scope, leave_tables_isolated, from_or_join): def _is_a_window_expression_in_unmergable_operation(): window_expressions = inner_select.find_all(exp.Window) window_alias_names = {window.parent.alias_or_name for window in window_expressions} - inner_select_name = inner_select.parent.alias_or_name + inner_select_name = from_or_join.alias_or_name unmergable_window_columns = [ column for column in outer_scope.columns diff --git a/sqlglot/optimizer/qualify_columns.py b/sqlglot/optimizer/qualify_columns.py index 952999d..b06ea1d 100644 --- a/sqlglot/optimizer/qualify_columns.py +++ b/sqlglot/optimizer/qualify_columns.py @@ -129,7 +129,7 @@ def _expand_using(scope: Scope, resolver: Resolver) -> t.Dict[str, t.Any]: table = columns.get(identifier) if not table or identifier not in join_columns: - if columns and join_columns: + if (columns and "*" not in columns) and join_columns: raise OptimizeError(f"Cannot automatically join: {identifier}") table = table or source_table |