Skip to content
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.

Sign up for GitHub

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

Fix issue when creating view using WITH clause #1809

Merged
merged 2 commits into from
May 30, 2024
Merged

Fix issue when creating view using WITH clause #1809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15e49fc
add test and fix issue
ericvergnaud May 30, 2024
edae092
Merge branch 'main' into Fix-issue-1798
ericvergnaud May 30, 2024
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
11 changes: 11 additions & 0 deletions src/databricks/labs/ucx/hive_metastore/view_migrate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ def _view_dependencies(self):
if len(statements) != 1 or statements[0] is None:
raise ValueError(f"Could not analyze view SQL: {self.src.view_text}")
statement = statements[0]
aliases = self._read_aliases(statement)
for old_table in statement.find_all(expressions.Table):
if old_table.name in aliases:
continue
if old_table.catalog and old_table.catalog != 'hive_metastore':
continue
src_db = old_table.db if old_table.db else self.src.database
Expand All @@ -41,6 +44,14 @@ def _view_dependencies(self):
continue
yield TableView("hive_metastore", src_db, old_table.name)

def _read_aliases(self, statement: expressions.Expression):
aliases = set()
for with_clause in statement.find_all(expressions.With):
for expression in with_clause.expressions:
if isinstance(expression, expressions.CTE):
aliases.add(expression.alias_or_name)
return aliases

def sql_migrate_view(self, index: MigrationIndex) -> str:
from_table = FromTable(index, CurrentSessionState(self.src.database))
assert self.src.view_text is not None, 'Expected a view text'
Expand Down
12 changes: 12 additions & 0 deletions tests/unit/hive_metastore/test_table_migrate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
MigrationStatusRefresher,
MigrationIndex,
MigrationStatus,
TableView,
)
from databricks.labs.ucx.hive_metastore.tables import (
AclMigrationWhat,
Expand All @@ -31,6 +32,7 @@
What,
)
from databricks.labs.ucx.hive_metastore.udfs import UdfsCrawler
from databricks.labs.ucx.hive_metastore.view_migrate import ViewToMigrate
from databricks.labs.ucx.workspace_access.groups import GroupManager

from .. import GROUPS, mock_table_mapping, mock_workspace_client
Expand Down Expand Up @@ -512,6 +514,16 @@ def test_migrate_view_should_produce_proper_queries(ws):
principal_grants.get_interactive_cluster_grants.assert_not_called()


def test_migrate_view_with_local_dataset_should_be_skipped(ws):
ddl = "CREATE VIEW v AS WITH t(a) AS (SELECT 1) SELECT * FROM t;"
to_migrate = ViewToMigrate(
Table("hive_metastore", "database", "", "EXTERNAL", "VIEW", None, ddl),
Rule("workspace", "catalog", "", "", "", ""),
)
dependencies = to_migrate.dependencies
assert dependencies == [TableView(catalog="hive_metastore", schema="database", name="v")]


def test_migrate_view_with_columns(ws):
errors = {}
create = "CREATE OR REPLACE VIEW hive_metastore.db1_src.view_src (a,b) AS SELECT * FROM db1_src.managed_dbfs"
Expand Down
Loading