Skip to content

Fix column order in incremental materialization when using contracts #575

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix column order in incremental materialization when using contracts #575

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
5 changes: 3 additions & 2 deletions dbt/include/clickhouse/macros/materializations/incremental/distributed_incremental.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
{% endif %}
{%- set inserts_only = config.get('inserts_only') -%}
{%- set grant_config = config.get('grants') -%}
{%- set has_contract = config.get('contract').enforced -%}
{%- set full_refresh_mode = (should_full_refresh() or existing_relation.is_view) -%}
{%- set on_schema_change = incremental_validate_on_schema_change(config.get('on_schema_change'), default='ignore') -%}

Expand Down Expand Up @@ -70,7 +71,7 @@
-- table. It is the user's responsibility to avoid duplicates. Note that "inserts_only" is a ClickHouse adapter
-- specific configurable that is used to avoid creating an expensive intermediate table.
{% call statement('main') %}
{{ clickhouse__insert_into(target_relation, sql) }}
{{ clickhouse__insert_into(target_relation, sql, has_contract) }}
{% endcall %}

{% else %}
Expand Down Expand Up @@ -99,7 +100,7 @@
{% do clickhouse__incremental_insert_overwrite(existing_relation, partition_by, True) %}
{% elif incremental_strategy == 'append' %}
{% call statement('main') %}
{{ clickhouse__insert_into(target_relation, sql) }}
{{ clickhouse__insert_into(target_relation, sql, has_contract) }}
{% endcall %}
{% endif %}
{% endif %}
Expand Down
5 changes: 3 additions & 2 deletions dbt/include/clickhouse/macros/materializations/incremental/incremental.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
{% endif %}
{%- set inserts_only = config.get('inserts_only') -%}
{%- set grant_config = config.get('grants') -%}
{%- set has_contract = config.get('contract').enforced -%}
Copy link
Contributor

@windsurf-bot windsurf-bot bot Nov 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The has_contract variable assignment might fail if config.get('contract') returns None. Consider adding a null check similar to how it's done in the table materialization:

Suggested change
{%- set has_contract = config.get('contract').enforced -%}
{%- set has_contract = config.get('contract') is not none and config.get('contract').enforced -%}

{%- set full_refresh_mode = (should_full_refresh() or existing_relation.is_view) -%}
{%- set on_schema_change = incremental_validate_on_schema_change(config.get('on_schema_change'), default='ignore') -%}

Expand Down Expand Up @@ -50,7 +51,7 @@
-- specific configurable that is used to avoid creating an expensive intermediate table.
-- insert_overwrite strategy does not require unique_key => is an exception.
{% call statement('main') %}
{{ clickhouse__insert_into(target_relation, sql) }}
{{ clickhouse__insert_into(target_relation, sql, has_contract) }}
{% endcall %}

{% else %}
Expand Down Expand Up @@ -81,7 +82,7 @@
{% do clickhouse__incremental_delete_insert(existing_relation, unique_key, incremental_predicates) %}
{% elif incremental_strategy == 'append' %}
{% call statement('main') %}
{{ clickhouse__insert_into(target_relation, sql) }}
{{ clickhouse__insert_into(target_relation, sql, has_contract) }}
{% endcall %}
{% elif incremental_strategy == 'insert_overwrite' %}
{% do clickhouse__incremental_insert_overwrite(existing_relation, partition_by, False) %}
Expand Down