diff --git a/.changes/unreleased/Dependencies-20231204-224210.yaml b/.changes/unreleased/Dependencies-20231204-224210.yaml new file mode 100644 index 000000000..c415934db --- /dev/null +++ b/.changes/unreleased/Dependencies-20231204-224210.yaml @@ -0,0 +1,6 @@ +kind: "Dependencies" +body: "Update freezegun requirement from ~=1.2 to ~=1.3" +time: 2023-12-04T22:42:10.00000Z +custom: + Author: dependabot[bot] + PR: 956 diff --git a/.changes/unreleased/Dependencies-20231212-223929.yaml b/.changes/unreleased/Dependencies-20231212-223929.yaml new file mode 100644 index 000000000..65f308f75 --- /dev/null +++ b/.changes/unreleased/Dependencies-20231212-223929.yaml @@ -0,0 +1,6 @@ +kind: "Dependencies" +body: "Update black requirement from ~=23.11 to ~=23.12" +time: 2023-12-12T22:39:29.00000Z +custom: + Author: dependabot[bot] + PR: 959 diff --git a/.changes/unreleased/Under the Hood-20231214-134728.yaml b/.changes/unreleased/Under the Hood-20231214-134728.yaml new file mode 100644 index 000000000..b1de2ddb7 --- /dev/null +++ b/.changes/unreleased/Under the Hood-20231214-134728.yaml @@ -0,0 +1,6 @@ +kind: Under the Hood +body: Remove unused `invalid_insert_overwrite_delta_msg` message +time: 2023-12-14T13:47:28.444107-07:00 +custom: + Author: dbeatty10 + Issue: "962" diff --git a/dbt/include/spark/macros/materializations/incremental/validate.sql b/dbt/include/spark/macros/materializations/incremental/validate.sql index 88b851ca4..0d4c4d8b6 100644 --- a/dbt/include/spark/macros/materializations/incremental/validate.sql +++ b/dbt/include/spark/macros/materializations/incremental/validate.sql @@ -29,17 +29,12 @@ You can only choose this strategy when file_format is set to 'delta' or 'iceberg' or 'hudi' {%- endset %} - {% set invalid_insert_overwrite_delta_msg -%} - Invalid incremental strategy provided: {{ raw_strategy }} - You cannot use this strategy when file_format is set to 'delta' or 'iceberg' - Use the 'append' or 'merge' strategy instead - {%- endset %} - {% set invalid_insert_overwrite_endpoint_msg -%} Invalid incremental strategy provided: {{ raw_strategy }} You cannot use this strategy when connecting via endpoint Use the 'append' or 'merge' strategy instead {%- endset %} + {% if raw_strategy not in ['append', 'merge', 'insert_overwrite'] %} {% do exceptions.raise_compiler_error(invalid_strategy_msg) %} {%-else %} diff --git a/dev-requirements.txt b/dev-requirements.txt index 1d8aea7b9..fe960ed03 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -5,12 +5,12 @@ git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-tests-adapter&subdirectory= # if version 1.x or greater -> pin to major version # if version 0.x -> pin to minor -black~=23.11 +black~=23.12 bumpversion~=0.6.0 click~=8.1 flake8~=6.1;python_version>="3.8" flaky~=3.7 -freezegun~=1.2 +freezegun~=1.3 ipdb~=0.13.13 mypy==1.7.1 # patch updates have historically introduced breaking changes pip-tools~=7.3