@@ -280,7 +280,7 @@ def test_create_table(
280
280
281
281
catalog ._client = MagicMock ()
282
282
catalog ._client .__enter__ ().create_table .return_value = None
283
- catalog ._client .__enter__ ().get_table .return_value = hive_table
283
+ catalog ._client .__enter__ ().get_table_objects_by_name .return_value = [ hive_table ]
284
284
catalog ._client .__enter__ ().get_database .return_value = hive_database
285
285
catalog .create_table (("default" , "table" ), schema = table_schema_with_all_types , properties = {"owner" : "javaberg" })
286
286
@@ -459,7 +459,7 @@ def test_create_table_with_given_location_removes_trailing_slash(
459
459
460
460
catalog ._client = MagicMock ()
461
461
catalog ._client .__enter__ ().create_table .return_value = None
462
- catalog ._client .__enter__ ().get_table .return_value = hive_table
462
+ catalog ._client .__enter__ ().get_table_objects_by_name .return_value = [ hive_table ]
463
463
catalog ._client .__enter__ ().get_database .return_value = hive_database
464
464
catalog .create_table (
465
465
("default" , "table" ), schema = table_schema_with_all_types , properties = {"owner" : "javaberg" }, location = f"{ location } /"
@@ -633,7 +633,7 @@ def test_create_v1_table(table_schema_simple: Schema, hive_database: HiveDatabas
633
633
634
634
catalog ._client = MagicMock ()
635
635
catalog ._client .__enter__ ().create_table .return_value = None
636
- catalog ._client .__enter__ ().get_table .return_value = hive_table
636
+ catalog ._client .__enter__ ().get_table_objects_by_name .return_value = [ hive_table ]
637
637
catalog ._client .__enter__ ().get_database .return_value = hive_database
638
638
catalog .create_table (
639
639
("default" , "table" ), schema = table_schema_simple , properties = {"owner" : "javaberg" , "format-version" : "1" }
@@ -684,10 +684,10 @@ def test_load_table(hive_table: HiveTable) -> None:
684
684
catalog = HiveCatalog (HIVE_CATALOG_NAME , uri = HIVE_METASTORE_FAKE_URL )
685
685
686
686
catalog ._client = MagicMock ()
687
- catalog ._client .__enter__ ().get_table .return_value = hive_table
687
+ catalog ._client .__enter__ ().get_table_objects_by_name .return_value = [ hive_table ]
688
688
table = catalog .load_table (("default" , "new_tabl2e" ))
689
689
690
- catalog ._client .__enter__ ().get_table .assert_called_with (dbname = "default" , tbl_name = "new_tabl2e" )
690
+ catalog ._client .__enter__ ().get_table_objects_by_name .assert_called_with (dbname = "default" , tbl_names = [ "new_tabl2e" ] )
691
691
692
692
expected = TableMetadataV2 (
693
693
location = "s3://bucket/test/location" ,
@@ -784,11 +784,11 @@ def test_load_table_from_self_identifier(hive_table: HiveTable) -> None:
784
784
catalog = HiveCatalog (HIVE_CATALOG_NAME , uri = HIVE_METASTORE_FAKE_URL )
785
785
786
786
catalog ._client = MagicMock ()
787
- catalog ._client .__enter__ ().get_table . return_value = hive_table
787
+ catalog ._client .__enter__ ().get_table_objects_by_name . side_effect = lambda dbname , tbl_names : [ hive_table ]
788
788
intermediate = catalog .load_table (("default" , "new_tabl2e" ))
789
789
table = catalog .load_table (intermediate .name ())
790
790
791
- catalog ._client .__enter__ ().get_table .assert_called_with (dbname = "default" , tbl_name = "new_tabl2e" )
791
+ catalog ._client .__enter__ ().get_table_objects_by_name .assert_called_with (dbname = "default" , tbl_names = [ "new_tabl2e" ] )
792
792
793
793
expected = TableMetadataV2 (
794
794
location = "s3://bucket/test/location" ,
@@ -889,7 +889,7 @@ def test_rename_table(hive_table: HiveTable) -> None:
889
889
renamed_table .tableName = "new_tabl3e"
890
890
891
891
catalog ._client = MagicMock ()
892
- catalog ._client .__enter__ ().get_table .side_effect = [hive_table , renamed_table ]
892
+ catalog ._client .__enter__ ().get_table_objects_by_name .side_effect = [[ hive_table ], [ renamed_table ] ]
893
893
catalog ._client .__enter__ ().alter_table_with_environment_context .return_value = None
894
894
895
895
from_identifier = ("default" , "new_tabl2e" )
@@ -898,8 +898,8 @@ def test_rename_table(hive_table: HiveTable) -> None:
898
898
899
899
assert table .name () == to_identifier
900
900
901
- calls = [call (dbname = "default" , tbl_name = "new_tabl2e" ), call (dbname = "default" , tbl_name = "new_tabl3e" )]
902
- catalog ._client .__enter__ ().get_table .assert_has_calls (calls )
901
+ calls = [call (dbname = "default" , tbl_names = [ "new_tabl2e" ] ), call (dbname = "default" , tbl_names = [ "new_tabl3e" ] )]
902
+ catalog ._client .__enter__ ().get_table_objects_by_name .assert_has_calls (calls )
903
903
catalog ._client .__enter__ ().alter_table_with_environment_context .assert_called_with (
904
904
dbname = "default" ,
905
905
tbl_name = "new_tabl2e" ,
@@ -912,25 +912,25 @@ def test_rename_table_from_self_identifier(hive_table: HiveTable) -> None:
912
912
catalog = HiveCatalog (HIVE_CATALOG_NAME , uri = HIVE_METASTORE_FAKE_URL )
913
913
914
914
catalog ._client = MagicMock ()
915
- catalog ._client .__enter__ ().get_table .return_value = hive_table
915
+ catalog ._client .__enter__ ().get_table_objects_by_name .return_value = [ hive_table ]
916
916
917
917
from_identifier = ("default" , "new_tabl2e" )
918
918
from_table = catalog .load_table (from_identifier )
919
- catalog ._client .__enter__ ().get_table .assert_called_with (dbname = "default" , tbl_name = "new_tabl2e" )
919
+ catalog ._client .__enter__ ().get_table_objects_by_name .assert_called_with (dbname = "default" , tbl_names = [ "new_tabl2e" ] )
920
920
921
921
renamed_table = copy .deepcopy (hive_table )
922
922
renamed_table .dbName = "default"
923
923
renamed_table .tableName = "new_tabl3e"
924
924
925
- catalog ._client .__enter__ ().get_table .side_effect = [hive_table , renamed_table ]
925
+ catalog ._client .__enter__ ().get_table_objects_by_name .side_effect = [[ hive_table ], [ renamed_table ] ]
926
926
catalog ._client .__enter__ ().alter_table_with_environment_context .return_value = None
927
927
to_identifier = ("default" , "new_tabl3e" )
928
928
table = catalog .rename_table (from_table .name (), to_identifier )
929
929
930
930
assert table .name () == to_identifier
931
931
932
- calls = [call (dbname = "default" , tbl_name = "new_tabl2e" ), call (dbname = "default" , tbl_name = "new_tabl3e" )]
933
- catalog ._client .__enter__ ().get_table .assert_has_calls (calls )
932
+ calls = [call (dbname = "default" , tbl_names = [ "new_tabl2e" ] ), call (dbname = "default" , tbl_names = [ "new_tabl3e" ] )]
933
+ catalog ._client .__enter__ ().get_table_objects_by_name .assert_has_calls (calls )
934
934
catalog ._client .__enter__ ().alter_table_with_environment_context .assert_called_with (
935
935
dbname = "default" ,
936
936
tbl_name = "new_tabl2e" ,
@@ -1049,7 +1049,7 @@ def test_drop_table_from_self_identifier(hive_table: HiveTable) -> None:
1049
1049
catalog = HiveCatalog (HIVE_CATALOG_NAME , uri = HIVE_METASTORE_FAKE_URL )
1050
1050
1051
1051
catalog ._client = MagicMock ()
1052
- catalog ._client .__enter__ ().get_table .return_value = hive_table
1052
+ catalog ._client .__enter__ ().get_table_objects_by_name .return_value = [ hive_table ]
1053
1053
table = catalog .load_table (("default" , "new_tabl2e" ))
1054
1054
1055
1055
catalog ._client .__enter__ ().get_all_databases .return_value = ["namespace1" , "namespace2" ]
0 commit comments