From 829a9ffb7e796a1d2a239ff7180210e89bd1245b Mon Sep 17 00:00:00 2001 From: Serhii Dimchenko Date: Thu, 3 Aug 2023 22:39:44 +0200 Subject: [PATCH] Fix run query method name --- dbt/adapters/athena/impl.py | 2 +- .../macros/materializations/models/incremental/helpers.sql | 2 +- .../athena/macros/materializations/models/incremental/merge.sql | 2 +- .../macros/materializations/models/table/create_table_as.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dbt/adapters/athena/impl.py b/dbt/adapters/athena/impl.py index a9883f98..4b659bf6 100755 --- a/dbt/adapters/athena/impl.py +++ b/dbt/adapters/athena/impl.py @@ -837,7 +837,7 @@ def is_list(self, value: Any) -> bool: return isinstance(value, list) @available - def safe_run_query(self, sql: str) -> str: + def run_query_with_partitions_limit_catching(self, sql: str) -> str: conn = self.connections.get_thread_connection() cursor = conn.handle.cursor() try: diff --git a/dbt/include/athena/macros/materializations/models/incremental/helpers.sql b/dbt/include/athena/macros/materializations/models/incremental/helpers.sql index a3f6c820..8c253dcf 100644 --- a/dbt/include/athena/macros/materializations/models/incremental/helpers.sql +++ b/dbt/include/athena/macros/materializations/models/incremental/helpers.sql @@ -36,7 +36,7 @@ ); {%- endset -%} - {%- set query_result = adapter.safe_run_query(insert_full) -%} + {%- set query_result = adapter.run_query_with_partitions_limit_catching(insert_full) -%} {%- do log('QUERY RESULT: ' ~ query_result) -%} {%- if query_result == 'TOO_MANY_OPEN_PARTITIONS' -%} {% set partitions_batches = get_partition_batches(tmp_relation) %} diff --git a/dbt/include/athena/macros/materializations/models/incremental/merge.sql b/dbt/include/athena/macros/materializations/models/incremental/merge.sql index 7bec9fcb..0bffc5c6 100644 --- a/dbt/include/athena/macros/materializations/models/incremental/merge.sql +++ b/dbt/include/athena/macros/materializations/models/incremental/merge.sql @@ -115,7 +115,7 @@ {{ merge_part }} {%- endset -%} - {%- set query_result = adapter.safe_run_query(merge_full) -%} + {%- set query_result = adapter.run_query_with_partitions_limit_catching(merge_full) -%} {%- do log('QUERY RESULT: ' ~ query_result) -%} {%- if query_result == 'TOO_MANY_OPEN_PARTITIONS' -%} {% set partitions_batches = get_partition_batches(tmp_relation) %} diff --git a/dbt/include/athena/macros/materializations/models/table/create_table_as.sql b/dbt/include/athena/macros/materializations/models/table/create_table_as.sql index f7df0cf1..c8e9f81e 100644 --- a/dbt/include/athena/macros/materializations/models/table/create_table_as.sql +++ b/dbt/include/athena/macros/materializations/models/table/create_table_as.sql @@ -117,7 +117,7 @@ {%- endmacro %} {% macro safe_create_table_as(temporary, relation, sql) -%} - {%- set query_result = adapter.safe_run_query(create_table_as(temporary, relation, sql)) -%} + {%- set query_result = adapter.run_query_with_partitions_limit_catching(create_table_as(temporary, relation, sql)) -%} {%- do log('QUERY RESULT: ' ~ query_result) -%} {%- if query_result == 'TOO_MANY_OPEN_PARTITIONS' -%} {%- do create_table_as_with_partitions(temporary, relation, sql) -%}