fix: add 'CatalogId' Parameter to Glue Paginator Call (Related to PR #…

…370) (#467) Co-authored-by: nicor88 <[email protected]>
dbt-labs · Oct 19, 2023 · 116fd73 · 116fd73
1 parent 502939b
commit 116fd73
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/dbt/adapters/athena/impl.py b/dbt/adapters/athena/impl.py
@@ -340,10 +340,14 @@ def clean_up_partitions(self, relation: AthenaRelation, where_condition: str) ->
         conn = self.connections.get_thread_connection()
         client = conn.handle
 
+        data_catalog = self._get_data_catalog(relation.database)
+        catalog_id = get_catalog_id(data_catalog)
+
         with boto3_client_lock:
             glue_client = client.session.client("glue", region_name=client.region_name, config=get_boto3_config())
         paginator = glue_client.get_paginator("get_partitions")
         partition_params = {
+            "CatalogId": catalog_id,
             "DatabaseName": relation.schema,
             "TableName": relation.identifier,
             "Expression": where_condition,

diff --git a/tests/unit/test_adapter.py b/tests/unit/test_adapter.py
@@ -509,6 +509,7 @@ def test_get_table_location_with_failure(self, dbt_debug_caplog, mock_aws_servic
     @mock_glue
     @mock_s3
     @mock_athena
+    @mock_sts
     def test_clean_up_partitions_will_work(self, dbt_debug_caplog, mock_aws_service):
         table_name = "table"
         mock_aws_service.create_data_catalog()