From daf30759fd55da639ae71868500e43fa621dbf3f Mon Sep 17 00:00:00 2001 From: FastLee Date: Tue, 27 Feb 2024 19:26:36 -0500 Subject: [PATCH 1/6] Added source WS functionality --- src/databricks/labs/ucx/hive_metastore/table_migrate.py | 3 +++ src/databricks/labs/ucx/hive_metastore/tables.py | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/src/databricks/labs/ucx/hive_metastore/table_migrate.py b/src/databricks/labs/ucx/hive_metastore/table_migrate.py index 64a17e9b8c..0238c90b4b 100644 --- a/src/databricks/labs/ucx/hive_metastore/table_migrate.py +++ b/src/databricks/labs/ucx/hive_metastore/table_migrate.py @@ -72,6 +72,7 @@ def _migrate_external_table(self, src_table: Table, rule: Rule): table_migrate_sql = src_table.sql_migrate_external(target_table_key) logger.debug(f"Migrating external table {src_table.key} to using SQL query: {table_migrate_sql}") self._backend.execute(table_migrate_sql) + self._backend.execute(src_table.sql_alter_from_ws(rule.as_uc_table_key, self._ws.get_workspace_id())) return True def _migrate_dbfs_root_table(self, src_table: Table, rule: Rule): @@ -81,6 +82,7 @@ def _migrate_dbfs_root_table(self, src_table: Table, rule: Rule): self._backend.execute(table_migrate_sql) self._backend.execute(src_table.sql_alter_to(rule.as_uc_table_key)) self._backend.execute(src_table.sql_alter_from(rule.as_uc_table_key)) + self._backend.execute(src_table.sql_alter_from_ws(rule.as_uc_table_key, self._ws.get_workspace_id())) return True def _migrate_view(self, src_table: Table, rule: Rule): @@ -90,6 +92,7 @@ def _migrate_view(self, src_table: Table, rule: Rule): self._backend.execute(table_migrate_sql) self._backend.execute(src_table.sql_alter_to(rule.as_uc_table_key)) self._backend.execute(src_table.sql_alter_from(rule.as_uc_table_key)) + self._backend.execute(src_table.sql_alter_from_ws(rule.as_uc_table_key, self._ws.get_workspace_id())) return True def _init_seen_tables(self): diff --git a/src/databricks/labs/ucx/hive_metastore/tables.py b/src/databricks/labs/ucx/hive_metastore/tables.py index 65b676d119..638b3f4f21 100644 --- a/src/databricks/labs/ucx/hive_metastore/tables.py +++ b/src/databricks/labs/ucx/hive_metastore/tables.py @@ -54,6 +54,8 @@ class Table: "dbfs:/databricks-datasets", ] + UPGRADED_FROM_WS_PARAM: typing.ClassVar[str] = "upgraded_from_ws" + @property def is_delta(self) -> bool: if self.table_format is None: @@ -74,6 +76,9 @@ def sql_alter_to(self, target_table_key): def sql_alter_from(self, target_table_key): return f"ALTER {self.kind} {target_table_key} SET TBLPROPERTIES ('upgraded_from' = '{self.key}');" + def sql_alter_from_ws(self, target_table_key, ws_id): + return f"ALTER {self.kind} {target_table_key} SET TBLPROPERTIES ('{self.UPGRADED_FROM_WS_PARAM}' = '{ws_id}');" + def sql_unset_upgraded_to(self): return f"ALTER {self.kind} {self.key} UNSET TBLPROPERTIES IF EXISTS('upgraded_to');" From 3d1607146dc43f82c7fb38cf6e5f7d897fd44cc5 Mon Sep 17 00:00:00 2001 From: FastLee Date: Tue, 27 Feb 2024 19:48:34 -0500 Subject: [PATCH 2/6] Added unit tests --- .../unit/hive_metastore/test_table_migrate.py | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/tests/unit/hive_metastore/test_table_migrate.py b/tests/unit/hive_metastore/test_table_migrate.py index ad3cc283e9..273ba2214c 100644 --- a/tests/unit/hive_metastore/test_table_migrate.py +++ b/tests/unit/hive_metastore/test_table_migrate.py @@ -24,7 +24,8 @@ def test_migrate_dbfs_root_tables_should_produce_proper_queries(): rows = {} backend = MockBackend(fails_on_first=errors, rows=rows) table_crawler = TablesCrawler(backend, "inventory_database") - client = MagicMock() + client = create_autospec(WorkspaceClient) + client.get_workspace_id.return_value = "12345" table_mapping = create_autospec(TableMapping) table_mapping.get_tables_to_migrate.return_value = [ TableToMigrate( @@ -57,6 +58,10 @@ def test_migrate_dbfs_root_tables_should_produce_proper_queries(): "ALTER TABLE ucx_default.db1_dst.managed_dbfs " "SET TBLPROPERTIES ('upgraded_from' = 'hive_metastore.db1_src.managed_dbfs');" ) in list(backend.queries) + assert ( + "ALTER TABLE ucx_default.db1_dst.managed_dbfs " + "SET TBLPROPERTIES ('upgraded_from_ws' = '12345');" + ) in list(backend.queries) assert "SYNC TABLE ucx_default.db1_dst.managed_other FROM hive_metastore.db1_src.managed_other;" in list( backend.queries ) @@ -86,7 +91,8 @@ def test_migrate_external_tables_should_produce_proper_queries(): rows = {} backend = MockBackend(fails_on_first=errors, rows=rows) table_crawler = TablesCrawler(backend, "inventory_database") - client = MagicMock() + client = create_autospec(WorkspaceClient) + client.get_workspace_id.return_value = "12345" table_mapping = create_autospec(TableMapping) table_mapping.get_tables_to_migrate.return_value = [ TableToMigrate( @@ -98,7 +104,9 @@ def test_migrate_external_tables_should_produce_proper_queries(): table_migrate.migrate_tables() assert (list(backend.queries)) == [ - "SYNC TABLE ucx_default.db1_dst.external_dst FROM hive_metastore.db1_src.external_src;" + "SYNC TABLE ucx_default.db1_dst.external_dst FROM hive_metastore.db1_src.external_src;", + ("ALTER TABLE ucx_default.db1_dst.external_dst " + "SET TBLPROPERTIES ('upgraded_from_ws' = '12345');") ] @@ -159,7 +167,8 @@ def test_migrate_view_should_produce_proper_queries(): rows = {} backend = MockBackend(fails_on_first=errors, rows=rows) table_crawler = TablesCrawler(backend, "inventory_database") - client = MagicMock() + client = create_autospec(WorkspaceClient) + client.get_workspace_id.return_value = "12345" table_mapping = create_autospec(TableMapping) table_mapping.get_tables_to_migrate.return_value = [ TableToMigrate( @@ -179,6 +188,10 @@ def test_migrate_view_should_produce_proper_queries(): "ALTER VIEW ucx_default.db1_dst.view_dst " "SET TBLPROPERTIES ('upgraded_from' = 'hive_metastore.db1_src.view_src');" ) in list(backend.queries) + assert ( + "ALTER VIEW ucx_default.db1_dst.view_dst " + "SET TBLPROPERTIES ('upgraded_from_ws' = '12345');" + ) in list(backend.queries) def get_table_migrate(backend: SqlBackend) -> TablesMigrate: From da33872203f370f40e65c6665b731cc10bd1f208 Mon Sep 17 00:00:00 2001 From: FastLee Date: Tue, 27 Feb 2024 20:31:26 -0500 Subject: [PATCH 3/6] Added integration tests --- .../labs/ucx/hive_metastore/table_migrate.py | 8 +++----- src/databricks/labs/ucx/hive_metastore/tables.py | 10 +++++----- tests/integration/hive_metastore/test_migrate.py | 5 +++++ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/databricks/labs/ucx/hive_metastore/table_migrate.py b/src/databricks/labs/ucx/hive_metastore/table_migrate.py index 0238c90b4b..f87e6276cd 100644 --- a/src/databricks/labs/ucx/hive_metastore/table_migrate.py +++ b/src/databricks/labs/ucx/hive_metastore/table_migrate.py @@ -72,7 +72,7 @@ def _migrate_external_table(self, src_table: Table, rule: Rule): table_migrate_sql = src_table.sql_migrate_external(target_table_key) logger.debug(f"Migrating external table {src_table.key} to using SQL query: {table_migrate_sql}") self._backend.execute(table_migrate_sql) - self._backend.execute(src_table.sql_alter_from_ws(rule.as_uc_table_key, self._ws.get_workspace_id())) + self._backend.execute(src_table.sql_alter_from(rule.as_uc_table_key, self._ws.get_workspace_id())) return True def _migrate_dbfs_root_table(self, src_table: Table, rule: Rule): @@ -81,8 +81,7 @@ def _migrate_dbfs_root_table(self, src_table: Table, rule: Rule): logger.debug(f"Migrating managed table {src_table.key} to using SQL query: {table_migrate_sql}") self._backend.execute(table_migrate_sql) self._backend.execute(src_table.sql_alter_to(rule.as_uc_table_key)) - self._backend.execute(src_table.sql_alter_from(rule.as_uc_table_key)) - self._backend.execute(src_table.sql_alter_from_ws(rule.as_uc_table_key, self._ws.get_workspace_id())) + self._backend.execute(src_table.sql_alter_from(rule.as_uc_table_key, self._ws.get_workspace_id())) return True def _migrate_view(self, src_table: Table, rule: Rule): @@ -91,8 +90,7 @@ def _migrate_view(self, src_table: Table, rule: Rule): logger.debug(f"Migrating view {src_table.key} to using SQL query: {table_migrate_sql}") self._backend.execute(table_migrate_sql) self._backend.execute(src_table.sql_alter_to(rule.as_uc_table_key)) - self._backend.execute(src_table.sql_alter_from(rule.as_uc_table_key)) - self._backend.execute(src_table.sql_alter_from_ws(rule.as_uc_table_key, self._ws.get_workspace_id())) + self._backend.execute(src_table.sql_alter_from(rule.as_uc_table_key, self._ws.get_workspace_id())) return True def _init_seen_tables(self): diff --git a/src/databricks/labs/ucx/hive_metastore/tables.py b/src/databricks/labs/ucx/hive_metastore/tables.py index 638b3f4f21..d3b20401f4 100644 --- a/src/databricks/labs/ucx/hive_metastore/tables.py +++ b/src/databricks/labs/ucx/hive_metastore/tables.py @@ -73,11 +73,11 @@ def kind(self) -> str: def sql_alter_to(self, target_table_key): return f"ALTER {self.kind} {self.key} SET TBLPROPERTIES ('upgraded_to' = '{target_table_key}');" - def sql_alter_from(self, target_table_key): - return f"ALTER {self.kind} {target_table_key} SET TBLPROPERTIES ('upgraded_from' = '{self.key}');" - - def sql_alter_from_ws(self, target_table_key, ws_id): - return f"ALTER {self.kind} {target_table_key} SET TBLPROPERTIES ('{self.UPGRADED_FROM_WS_PARAM}' = '{ws_id}');" + def sql_alter_from(self, target_table_key, ws_id): + return (f"ALTER {self.kind} {target_table_key} SET TBLPROPERTIES " + f"('upgraded_from' = '{self.key}');\n" + f"ALTER {self.kind} {target_table_key} SET TBLPROPERTIES " + f"('{self.UPGRADED_FROM_WS_PARAM}' = '{ws_id}');") def sql_unset_upgraded_to(self): return f"ALTER {self.kind} {self.key} UNSET TBLPROPERTIES IF EXISTS('upgraded_to');" diff --git a/tests/integration/hive_metastore/test_migrate.py b/tests/integration/hive_metastore/test_migrate.py index f7e058116e..dfadd86118 100644 --- a/tests/integration/hive_metastore/test_migrate.py +++ b/tests/integration/hive_metastore/test_migrate.py @@ -46,6 +46,7 @@ def test_migrate_managed_tables(ws, sql_backend, inventory_schema, make_catalog, target_table_properties = ws.tables.get(f"{dst_schema.full_name}.{src_managed_table.name}").properties assert target_table_properties["upgraded_from"] == src_managed_table.full_name + assert target_table_properties["upgraded_from_ws"] == str(ws.get_workspace_id()) @retried(on=[NotFound], timeout=timedelta(minutes=5)) @@ -136,6 +137,10 @@ def test_migrate_external_table(ws, sql_backend, inventory_schema, make_catalog, target_tables = list(sql_backend.fetch(f"SHOW TABLES IN {dst_schema.full_name}")) assert len(target_tables) == 1 + target_table_properties = ws.tables.get(f"{dst_schema.full_name}.{src_external_table.name}").properties + assert target_table_properties["upgraded_from"] == src_external_table.full_name + assert target_table_properties["upgraded_from_ws"] == str(ws.get_workspace_id()) + @retried(on=[NotFound], timeout=timedelta(minutes=5)) From f0562f70e2f9af1d64411b67c713902c644cb3f4 Mon Sep 17 00:00:00 2001 From: FastLee Date: Tue, 27 Feb 2024 20:44:06 -0500 Subject: [PATCH 4/6] Addressed unit and integration test. --- src/databricks/labs/ucx/hive_metastore/tables.py | 5 ++--- tests/integration/hive_metastore/test_migrate.py | 1 - tests/unit/hive_metastore/test_table_migrate.py | 14 +++----------- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/databricks/labs/ucx/hive_metastore/tables.py b/src/databricks/labs/ucx/hive_metastore/tables.py index d3b20401f4..c8b0915dcd 100644 --- a/src/databricks/labs/ucx/hive_metastore/tables.py +++ b/src/databricks/labs/ucx/hive_metastore/tables.py @@ -75,9 +75,8 @@ def sql_alter_to(self, target_table_key): def sql_alter_from(self, target_table_key, ws_id): return (f"ALTER {self.kind} {target_table_key} SET TBLPROPERTIES " - f"('upgraded_from' = '{self.key}');\n" - f"ALTER {self.kind} {target_table_key} SET TBLPROPERTIES " - f"('{self.UPGRADED_FROM_WS_PARAM}' = '{ws_id}');") + f"('upgraded_from' = '{self.key}'" + f" , '{self.UPGRADED_FROM_WS_PARAM}' = '{ws_id}');") def sql_unset_upgraded_to(self): return f"ALTER {self.kind} {self.key} UNSET TBLPROPERTIES IF EXISTS('upgraded_to');" diff --git a/tests/integration/hive_metastore/test_migrate.py b/tests/integration/hive_metastore/test_migrate.py index dfadd86118..99a22cd1a2 100644 --- a/tests/integration/hive_metastore/test_migrate.py +++ b/tests/integration/hive_metastore/test_migrate.py @@ -142,7 +142,6 @@ def test_migrate_external_table(ws, sql_backend, inventory_schema, make_catalog, assert target_table_properties["upgraded_from_ws"] == str(ws.get_workspace_id()) - @retried(on=[NotFound], timeout=timedelta(minutes=5)) def test_revert_migrated_table( ws, sql_backend, inventory_schema, make_schema, make_table, make_catalog diff --git a/tests/unit/hive_metastore/test_table_migrate.py b/tests/unit/hive_metastore/test_table_migrate.py index 273ba2214c..fa36fc7384 100644 --- a/tests/unit/hive_metastore/test_table_migrate.py +++ b/tests/unit/hive_metastore/test_table_migrate.py @@ -56,11 +56,7 @@ def test_migrate_dbfs_root_tables_should_produce_proper_queries(): ) in list(backend.queries) assert ( "ALTER TABLE ucx_default.db1_dst.managed_dbfs " - "SET TBLPROPERTIES ('upgraded_from' = 'hive_metastore.db1_src.managed_dbfs');" - ) in list(backend.queries) - assert ( - "ALTER TABLE ucx_default.db1_dst.managed_dbfs " - "SET TBLPROPERTIES ('upgraded_from_ws' = '12345');" + "SET TBLPROPERTIES ('upgraded_from' = 'hive_metastore.db1_src.managed_dbfs' , 'upgraded_from_ws' = '12345');" ) in list(backend.queries) assert "SYNC TABLE ucx_default.db1_dst.managed_other FROM hive_metastore.db1_src.managed_other;" in list( backend.queries @@ -106,7 +102,7 @@ def test_migrate_external_tables_should_produce_proper_queries(): assert (list(backend.queries)) == [ "SYNC TABLE ucx_default.db1_dst.external_dst FROM hive_metastore.db1_src.external_src;", ("ALTER TABLE ucx_default.db1_dst.external_dst " - "SET TBLPROPERTIES ('upgraded_from_ws' = '12345');") + "SET TBLPROPERTIES ('upgraded_from' = 'hive_metastore.db1_src.external_src' , 'upgraded_from_ws' = '12345');") ] @@ -186,11 +182,7 @@ def test_migrate_view_should_produce_proper_queries(): ) in list(backend.queries) assert ( "ALTER VIEW ucx_default.db1_dst.view_dst " - "SET TBLPROPERTIES ('upgraded_from' = 'hive_metastore.db1_src.view_src');" - ) in list(backend.queries) - assert ( - "ALTER VIEW ucx_default.db1_dst.view_dst " - "SET TBLPROPERTIES ('upgraded_from_ws' = '12345');" + "SET TBLPROPERTIES ('upgraded_from' = 'hive_metastore.db1_src.view_src' , 'upgraded_from_ws' = '12345');" ) in list(backend.queries) From 828cbe01643b8bff39cb26bb2c8f1eb33fd34e59 Mon Sep 17 00:00:00 2001 From: FastLee Date: Tue, 27 Feb 2024 20:45:37 -0500 Subject: [PATCH 5/6] Formatting Challenge --- src/databricks/labs/ucx/hive_metastore/tables.py | 8 +++++--- tests/unit/hive_metastore/test_table_migrate.py | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/databricks/labs/ucx/hive_metastore/tables.py b/src/databricks/labs/ucx/hive_metastore/tables.py index c8b0915dcd..1843288bc6 100644 --- a/src/databricks/labs/ucx/hive_metastore/tables.py +++ b/src/databricks/labs/ucx/hive_metastore/tables.py @@ -74,9 +74,11 @@ def sql_alter_to(self, target_table_key): return f"ALTER {self.kind} {self.key} SET TBLPROPERTIES ('upgraded_to' = '{target_table_key}');" def sql_alter_from(self, target_table_key, ws_id): - return (f"ALTER {self.kind} {target_table_key} SET TBLPROPERTIES " - f"('upgraded_from' = '{self.key}'" - f" , '{self.UPGRADED_FROM_WS_PARAM}' = '{ws_id}');") + return ( + f"ALTER {self.kind} {target_table_key} SET TBLPROPERTIES " + f"('upgraded_from' = '{self.key}'" + f" , '{self.UPGRADED_FROM_WS_PARAM}' = '{ws_id}');" + ) def sql_unset_upgraded_to(self): return f"ALTER {self.kind} {self.key} UNSET TBLPROPERTIES IF EXISTS('upgraded_to');" diff --git a/tests/unit/hive_metastore/test_table_migrate.py b/tests/unit/hive_metastore/test_table_migrate.py index fa36fc7384..831ddf1e76 100644 --- a/tests/unit/hive_metastore/test_table_migrate.py +++ b/tests/unit/hive_metastore/test_table_migrate.py @@ -101,8 +101,10 @@ def test_migrate_external_tables_should_produce_proper_queries(): assert (list(backend.queries)) == [ "SYNC TABLE ucx_default.db1_dst.external_dst FROM hive_metastore.db1_src.external_src;", - ("ALTER TABLE ucx_default.db1_dst.external_dst " - "SET TBLPROPERTIES ('upgraded_from' = 'hive_metastore.db1_src.external_src' , 'upgraded_from_ws' = '12345');") + ( + "ALTER TABLE ucx_default.db1_dst.external_dst " + "SET TBLPROPERTIES ('upgraded_from' = 'hive_metastore.db1_src.external_src' , 'upgraded_from_ws' = '12345');" + ), ] From fc0a255f04a0bf88a85057477ff937a1f706ca12 Mon Sep 17 00:00:00 2001 From: FastLee Date: Wed, 28 Feb 2024 08:46:11 -0500 Subject: [PATCH 6/6] Addressed Comments --- src/databricks/labs/ucx/hive_metastore/tables.py | 2 +- tests/integration/hive_metastore/test_migrate.py | 5 +++-- tests/unit/hive_metastore/test_table_migrate.py | 12 ++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/databricks/labs/ucx/hive_metastore/tables.py b/src/databricks/labs/ucx/hive_metastore/tables.py index 1843288bc6..40798b9634 100644 --- a/src/databricks/labs/ucx/hive_metastore/tables.py +++ b/src/databricks/labs/ucx/hive_metastore/tables.py @@ -54,7 +54,7 @@ class Table: "dbfs:/databricks-datasets", ] - UPGRADED_FROM_WS_PARAM: typing.ClassVar[str] = "upgraded_from_ws" + UPGRADED_FROM_WS_PARAM: typing.ClassVar[str] = "upgraded_from_workspace_id" @property def is_delta(self) -> bool: diff --git a/tests/integration/hive_metastore/test_migrate.py b/tests/integration/hive_metastore/test_migrate.py index 99a22cd1a2..cd60230ce4 100644 --- a/tests/integration/hive_metastore/test_migrate.py +++ b/tests/integration/hive_metastore/test_migrate.py @@ -7,6 +7,7 @@ from databricks.labs.ucx.hive_metastore.mapping import Rule from databricks.labs.ucx.hive_metastore.table_migrate import TablesMigrate +from databricks.labs.ucx.hive_metastore.tables import Table from ..conftest import StaticTableMapping, StaticTablesCrawler @@ -46,7 +47,7 @@ def test_migrate_managed_tables(ws, sql_backend, inventory_schema, make_catalog, target_table_properties = ws.tables.get(f"{dst_schema.full_name}.{src_managed_table.name}").properties assert target_table_properties["upgraded_from"] == src_managed_table.full_name - assert target_table_properties["upgraded_from_ws"] == str(ws.get_workspace_id()) + assert target_table_properties[Table.UPGRADED_FROM_WS_PARAM] == str(ws.get_workspace_id()) @retried(on=[NotFound], timeout=timedelta(minutes=5)) @@ -139,7 +140,7 @@ def test_migrate_external_table(ws, sql_backend, inventory_schema, make_catalog, assert len(target_tables) == 1 target_table_properties = ws.tables.get(f"{dst_schema.full_name}.{src_external_table.name}").properties assert target_table_properties["upgraded_from"] == src_external_table.full_name - assert target_table_properties["upgraded_from_ws"] == str(ws.get_workspace_id()) + assert target_table_properties[Table.UPGRADED_FROM_WS_PARAM] == str(ws.get_workspace_id()) @retried(on=[NotFound], timeout=timedelta(minutes=5)) diff --git a/tests/unit/hive_metastore/test_table_migrate.py b/tests/unit/hive_metastore/test_table_migrate.py index 831ddf1e76..ecd1f5bad2 100644 --- a/tests/unit/hive_metastore/test_table_migrate.py +++ b/tests/unit/hive_metastore/test_table_migrate.py @@ -55,8 +55,8 @@ def test_migrate_dbfs_root_tables_should_produce_proper_queries(): "SET TBLPROPERTIES ('upgraded_to' = 'ucx_default.db1_dst.managed_dbfs');" ) in list(backend.queries) assert ( - "ALTER TABLE ucx_default.db1_dst.managed_dbfs " - "SET TBLPROPERTIES ('upgraded_from' = 'hive_metastore.db1_src.managed_dbfs' , 'upgraded_from_ws' = '12345');" + f"ALTER TABLE ucx_default.db1_dst.managed_dbfs " + f"SET TBLPROPERTIES ('upgraded_from' = 'hive_metastore.db1_src.managed_dbfs' , '{Table.UPGRADED_FROM_WS_PARAM}' = '12345');" ) in list(backend.queries) assert "SYNC TABLE ucx_default.db1_dst.managed_other FROM hive_metastore.db1_src.managed_other;" in list( backend.queries @@ -102,8 +102,8 @@ def test_migrate_external_tables_should_produce_proper_queries(): assert (list(backend.queries)) == [ "SYNC TABLE ucx_default.db1_dst.external_dst FROM hive_metastore.db1_src.external_src;", ( - "ALTER TABLE ucx_default.db1_dst.external_dst " - "SET TBLPROPERTIES ('upgraded_from' = 'hive_metastore.db1_src.external_src' , 'upgraded_from_ws' = '12345');" + f"ALTER TABLE ucx_default.db1_dst.external_dst " + f"SET TBLPROPERTIES ('upgraded_from' = 'hive_metastore.db1_src.external_src' , '{Table.UPGRADED_FROM_WS_PARAM}' = '12345');" ), ] @@ -183,8 +183,8 @@ def test_migrate_view_should_produce_proper_queries(): "SET TBLPROPERTIES ('upgraded_to' = 'ucx_default.db1_dst.view_dst');" ) in list(backend.queries) assert ( - "ALTER VIEW ucx_default.db1_dst.view_dst " - "SET TBLPROPERTIES ('upgraded_from' = 'hive_metastore.db1_src.view_src' , 'upgraded_from_ws' = '12345');" + f"ALTER VIEW ucx_default.db1_dst.view_dst " + f"SET TBLPROPERTIES ('upgraded_from' = 'hive_metastore.db1_src.view_src' , '{Table.UPGRADED_FROM_WS_PARAM}' = '12345');" ) in list(backend.queries)