Skip to content

CORE-1558: fix: run discard-result DDL/DML without fetching results #1080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EladBarkay wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −22
Open

CORE-1558: fix: run discard-result DDL/DML without fetching results #1080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion macros/commands/delete_duplicate_rows.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down
2 changes: 1 addition & 1 deletion macros/commands/fix_nanosecond_timing_values.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion macros/edr/tests/test_all_columns_anomalies.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
dimensions,
)
) %}
{%- do elementary.run_query(
{%- do elementary.execute_no_fetch(
elementary.insert_as_select(
temp_table_relation, column_monitoring_query
)
Expand Down
4 changes: 3 additions & 1 deletion macros/edr/tests/test_utils/clean_elementary_test_tables.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

Expand Down
4 changes: 2 additions & 2 deletions macros/utils/table_operations/create_or_replace.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@
{% 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,
sql_query,
drop_first=true,
expiration_hours=expiration_hours,
) %}
{% do elementary.run_query("COMMIT") %}
{% do elementary.execute_no_fetch("COMMIT") %}
{% endmacro %}

{% macro spark__create_or_replace(
Expand Down
2 changes: 1 addition & 1 deletion macros/utils/table_operations/create_table_as.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
10 changes: 5 additions & 5 deletions macros/utils/table_operations/create_temp_table.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand All @@ -88,7 +88,7 @@

{% endset %}

{% do elementary.run_query(create_query) %}
{% do elementary.execute_no_fetch(create_query) %}

{{ return(temp_table_relation) }}
{% endmacro %}
Expand Down
2 changes: 1 addition & 1 deletion macros/utils/table_operations/delete_and_insert.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
2 changes: 1 addition & 1 deletion macros/utils/table_operations/delete_if_incremental.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
2 changes: 1 addition & 1 deletion macros/utils/table_operations/remove_rows.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
14 changes: 7 additions & 7 deletions macros/utils/table_operations/replace_table_data.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand All @@ -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
) %}

Expand Down Expand Up @@ -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(
Expand Down
Loading