diff --git a/macros/commands/delete_duplicate_rows.sql b/macros/commands/delete_duplicate_rows.sql index c54edac49..5005a48b1 100644 --- a/macros/commands/delete_duplicate_rows.sql +++ b/macros/commands/delete_duplicate_rows.sql @@ -31,7 +31,7 @@ AND t1.{{ col }} = t2.{{ col }} {% endfor %} {% endset %} - {% do elementary.run_query(query) %} + {% do elementary.execute_no_fetch(query) %} {% do adapter.commit() %} {% endmacro %} diff --git a/macros/commands/fix_nanosecond_timing_values.sql b/macros/commands/fix_nanosecond_timing_values.sql index 215e453f0..37100ac10 100644 --- a/macros/commands/fix_nanosecond_timing_values.sql +++ b/macros/commands/fix_nanosecond_timing_values.sql @@ -46,7 +46,7 @@ {% endfor %} where {{ where_clause }} {% endset %} - {% do elementary.run_query(update_query) %} + {% do elementary.execute_no_fetch(update_query) %} {% do print("Fixed {} rows in {}.".format(rows_to_fix, relation)) %} {% endfor %} {% endmacro %} diff --git a/macros/edr/tests/test_all_columns_anomalies.sql b/macros/edr/tests/test_all_columns_anomalies.sql index 10a5e72cb..19a1cf84b 100644 --- a/macros/edr/tests/test_all_columns_anomalies.sql +++ b/macros/edr/tests/test_all_columns_anomalies.sql @@ -159,7 +159,7 @@ dimensions, ) ) %} - {%- do elementary.run_query( + {%- do elementary.execute_no_fetch( elementary.insert_as_select( temp_table_relation, column_monitoring_query ) diff --git a/macros/edr/tests/test_utils/clean_elementary_test_tables.sql b/macros/edr/tests/test_utils/clean_elementary_test_tables.sql index 1e60b2e7c..cc36a1f18 100644 --- a/macros/edr/tests/test_utils/clean_elementary_test_tables.sql +++ b/macros/edr/tests/test_utils/clean_elementary_test_tables.sql @@ -26,7 +26,9 @@ {% set queries = elementary.get_clean_elementary_test_tables_queries( test_table_relations ) %} - {% for query in queries %} {% do elementary.run_query(query) %} {% endfor %} + {% for query in queries %} + {% do elementary.execute_no_fetch(query) %} + {% endfor %} {% endif %} {% endmacro %} diff --git a/macros/utils/table_operations/create_or_replace.sql b/macros/utils/table_operations/create_or_replace.sql index e38154171..fd4d9c617 100644 --- a/macros/utils/table_operations/create_or_replace.sql +++ b/macros/utils/table_operations/create_or_replace.sql @@ -33,7 +33,7 @@ {% macro postgres__create_or_replace( temporary, relation, sql_query, expiration_hours=none ) %} - {% do elementary.run_query("BEGIN") %} + {% do elementary.execute_no_fetch("BEGIN") %} {% do elementary.edr_create_table_as( temporary, relation, @@ -41,7 +41,7 @@ drop_first=true, expiration_hours=expiration_hours, ) %} - {% do elementary.run_query("COMMIT") %} + {% do elementary.execute_no_fetch("COMMIT") %} {% endmacro %} {% macro spark__create_or_replace( diff --git a/macros/utils/table_operations/create_table_as.sql b/macros/utils/table_operations/create_table_as.sql index 61a16a6a5..8ee31a3c9 100644 --- a/macros/utils/table_operations/create_table_as.sql +++ b/macros/utils/table_operations/create_table_as.sql @@ -15,7 +15,7 @@ {% set create_query = elementary.edr_get_create_table_as_sql( temporary, relation, sql_query, expiration_hours=expiration_hours ) %} - {% do elementary.run_query(create_query) %} + {% do elementary.execute_no_fetch(create_query) %} {% if should_commit %} {% do elementary.edr_commit() %} {% endif %} {% endmacro %} diff --git a/macros/utils/table_operations/create_temp_table.sql b/macros/utils/table_operations/create_temp_table.sql index 9368d8218..bdced1c34 100644 --- a/macros/utils/table_operations/create_temp_table.sql +++ b/macros/utils/table_operations/create_temp_table.sql @@ -60,10 +60,10 @@ {% set vw_ref = vw_relation.include(database=false) %} {% set tbl_ref = table_relation.include(database=false) %} - {% do elementary.run_query("DROP VIEW IF EXISTS " ~ vw_ref) %} - {% do elementary.run_query("CREATE VIEW " ~ vw_ref ~ " AS " ~ sql_query) %} - {% do elementary.run_query("SELECT * INTO " ~ tbl_ref ~ " FROM " ~ vw_ref) %} - {% do elementary.run_query("DROP VIEW " ~ vw_ref) %} + {% do elementary.execute_no_fetch("DROP VIEW IF EXISTS " ~ vw_ref) %} + {% do elementary.execute_no_fetch("CREATE VIEW " ~ vw_ref ~ " AS " ~ sql_query) %} + {% do elementary.execute_no_fetch("SELECT * INTO " ~ tbl_ref ~ " FROM " ~ vw_ref) %} + {% do elementary.execute_no_fetch("DROP VIEW " ~ vw_ref) %} {{ return(table_relation) }} {% endmacro %} @@ -88,7 +88,7 @@ {% endset %} - {% do elementary.run_query(create_query) %} + {% do elementary.execute_no_fetch(create_query) %} {{ return(temp_table_relation) }} {% endmacro %} diff --git a/macros/utils/table_operations/delete_and_insert.sql b/macros/utils/table_operations/delete_and_insert.sql index 559c4a8af..bdc1f0a51 100644 --- a/macros/utils/table_operations/delete_and_insert.sql +++ b/macros/utils/table_operations/delete_and_insert.sql @@ -29,7 +29,7 @@ {% set queries = elementary.get_delete_and_insert_queries( relation, insert_relation, delete_relation, delete_column_key ) %} - {% for query in queries %} {% do elementary.run_query(query) %} {% endfor %} + {% for query in queries %} {% do elementary.execute_no_fetch(query) %} {% endfor %} {# DuckDB: explicit commit so changes survive dbt's post-on-run-end ROLLBACK #} {% if target.type == "duckdb" %} {% do adapter.commit() %} {% endif %} diff --git a/macros/utils/table_operations/delete_if_incremental.sql b/macros/utils/table_operations/delete_if_incremental.sql index aecb6fea2..4010d425e 100644 --- a/macros/utils/table_operations/delete_if_incremental.sql +++ b/macros/utils/table_operations/delete_if_incremental.sql @@ -5,6 +5,6 @@ where {{ where_clause }} {% endset %} - {% if is_incremental() %} {% do elementary.run_query(query) %} {% endif %} + {% if is_incremental() %} {% do elementary.execute_no_fetch(query) %} {% endif %} {% endmacro %} diff --git a/macros/utils/table_operations/remove_rows.sql b/macros/utils/table_operations/remove_rows.sql index 2a587b46d..2ede49094 100644 --- a/macros/utils/table_operations/remove_rows.sql +++ b/macros/utils/table_operations/remove_rows.sql @@ -3,6 +3,6 @@ {% set remove_rows_query %} delete from {{ table_name }} {% endset %} - {% do elementary.run_query(remove_rows_query) %} + {% do elementary.execute_no_fetch(remove_rows_query) %} {% endmacro %} diff --git a/macros/utils/table_operations/replace_table_data.sql b/macros/utils/table_operations/replace_table_data.sql index 1a7cfa710..9a3a48de4 100644 --- a/macros/utils/table_operations/replace_table_data.sql +++ b/macros/utils/table_operations/replace_table_data.sql @@ -60,12 +60,12 @@ relation, rows, temporary=True ) %} - {% do elementary.run_query("begin") %} - {% do elementary.run_query("delete from " ~ relation) %} - {% do elementary.run_query( + {% do elementary.execute_no_fetch("begin") %} + {% do elementary.execute_no_fetch("delete from " ~ relation) %} + {% do elementary.execute_no_fetch( "insert into " ~ relation ~ " select * from " ~ intermediate_relation ) %} - {% do elementary.run_query("commit") %} + {% do elementary.execute_no_fetch("commit") %} {% do adapter.drop_relation(intermediate_relation) %} {% endmacro %} @@ -80,8 +80,8 @@ relation, rows, temporary=True ) %} - {% do elementary.run_query("delete from " ~ relation) %} - {% do elementary.run_query( + {% do elementary.execute_no_fetch("delete from " ~ relation) %} + {% do elementary.execute_no_fetch( "insert into " ~ relation ~ " select * from " ~ intermediate_relation ) %} @@ -127,7 +127,7 @@ Uses explicit TRUNCATE with on_cluster_clause for distributed/replicated tables, matching the pattern in delete_and_insert.sql and clean_elementary_test_tables.sql. #} {% macro clickhouse__replace_table_data(relation, rows) %} - {% do elementary.run_query( + {% do elementary.execute_no_fetch( "truncate table " ~ relation ~ " " ~ on_cluster_clause(relation) ) %} {% do elementary.insert_rows(