dbt-adapters 1.13.2__py3-none-any.whl → 1.14.0__py3-none-any.whl

dbt/adapters/__about__.py

@@ -1 +1 @@
-version = "1.13.2"
+version = "1.14.0"

dbt/adapters/base/impl.py

@@ -104,7 +104,12 @@ DEFAULT_BASE_BEHAVIOR_FLAGS = [
         "name": "require_batched_execution_for_custom_microbatch_strategy",
         "default": False,
         "docs_url": "https://docs.getdbt.com/docs/build/incremental-microbatch",
-    }
+    },
+    {
+        "name": "enable_truthy_nulls_equals_macro",
+        "default": False,
+        "docs_url": "",
+    },
 ]
 
 

dbt/include/global_project/macros/materializations/models/incremental/merge.sql

@@ -21,9 +21,9 @@
                 {% do predicates.append(this_key_match) %}
             {% endfor %}
         {% else %}
-            {% set unique_key_match %}
-                DBT_INTERNAL_SOURCE.{{ unique_key }} = DBT_INTERNAL_DEST.{{ unique_key }}
-            {% endset %}
+            {% set source_unique_key = ("DBT_INTERNAL_SOURCE." ~ unique_key) | trim %}
+	    {% set target_unique_key = ("DBT_INTERNAL_DEST." ~ unique_key) | trim %}
+	    {% set unique_key_match = equals(source_unique_key, target_unique_key) | trim %}
             {% do predicates.append(unique_key_match) %}
         {% endif %}
     {% else %}
@@ -62,11 +62,13 @@
 
     {% if unique_key %}
         {% if unique_key is sequence and unique_key is not string %}
-            delete from {{target }}
+            delete from {{ target }}
             using {{ source }}
             where (
                 {% for key in unique_key %}
-                    {{ source }}.{{ key }} = {{ target }}.{{ key }}
+		    {% set source_unique_key = (source ~ "." ~ key) | trim %}
+		    {% set target_unique_key = (target ~ "." ~ key) | trim %}
+                    {{ equals(source_unique_key, target_unique_key) }}
                     {{ "and " if not loop.last}}
                 {% endfor %}
                 {% if incremental_predicates %}

dbt/include/global_project/macros/materializations/snapshots/helpers.sql

@@ -55,8 +55,11 @@
         from {{ target_relation }}
         where
             {% if config.get('dbt_valid_to_current') %}
-               {# Check for either dbt_valid_to_current OR null, in order to correctly update records with nulls #}
-               ( {{ columns.dbt_valid_to }} = {{ config.get('dbt_valid_to_current') }} or {{ columns.dbt_valid_to }} is null)
+		{% set source_unique_key = columns.dbt_valid_to | trim %}
+		{% set target_unique_key = config.get('dbt_valid_to_current') | trim %}
+
+		{# The exact equals semantics between NULL values depends on the current behavior flag set. Also, update records if the source field is null #}
+                ( {{ equals(source_unique_key, target_unique_key) }} or {{ source_unique_key }} is null )
             {% else %}
                 {{ columns.dbt_valid_to }} is null
             {% endif %}
@@ -279,7 +282,9 @@
 {% macro unique_key_join_on(unique_key, identifier, from_identifier) %}
     {% if unique_key | is_list %}
         {% for key in unique_key %}
-            {{ identifier }}.dbt_unique_key_{{ loop.index }} = {{ from_identifier }}.dbt_unique_key_{{ loop.index }}
+	    {% set source_unique_key = (identifier ~ ".dbt_unique_key_" ~ loop.index) | trim %}
+	    {% set target_unique_key = (from_identifier ~ ".dbt_unique_key_" ~ loop.index) | trim %}
+	    {{ equals(source_unique_key, target_unique_key) }}
             {%- if not loop.last %} and {%- endif %}
         {% endfor %}
     {% else %}

dbt/include/global_project/macros/materializations/snapshots/snapshot_merge.sql

@@ -15,8 +15,10 @@
 
     when matched
      {% if config.get("dbt_valid_to_current") %}
-       and (DBT_INTERNAL_DEST.{{ columns.dbt_valid_to }} = {{ config.get('dbt_valid_to_current') }} or
-            DBT_INTERNAL_DEST.{{ columns.dbt_valid_to }} is null)
+	{% set source_unique_key = ("DBT_INTERNAL_DEST." ~ columns.dbt_valid_to) | trim %}
+	{% set target_unique_key = config.get('dbt_valid_to_current') | trim %}
+	and ({{ equals(source_unique_key, target_unique_key) }} or {{ source_unique_key }} is null)
+
      {% else %}
        and DBT_INTERNAL_DEST.{{ columns.dbt_valid_to }} is null
      {% endif %}

dbt/include/global_project/macros/utils/equals.sql

@@ -0,0 +1,14 @@
+{% macro equals(expr1, expr2) %}
+    {{ return(adapter.dispatch('equals', 'dbt') (expr1, expr2)) }}
+{%- endmacro %}
+
+{% macro default__equals(expr1, expr2) -%}
+{%- if adapter.behavior.enable_truthy_nulls_equals_macro.no_warn %}
+    case when (({{ expr1 }} = {{ expr2 }}) or ({{ expr1 }} is null and {{ expr2 }} is null))
+        then 0
+        else 1
+    end = 0
+{%- else -%}
+    ({{ expr1 }} = {{ expr2 }})
+{%- endif %}
+{% endmacro %}

{dbt_adapters-1.13.2.dist-info → dbt_adapters-1.14.0.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: dbt-adapters
-Version: 1.13.2
+Version: 1.14.0
 Summary: The set of adapter protocols and base functionality that supports integration with dbt-core
-Project-URL: Homepage, https://github.com/dbt-labs/dbt-adapters
+Project-URL: Homepage, https://github.com/dbt-labs/dbt-adapters/tree/main/dbt-adapters
 Project-URL: Documentation, https://docs.getdbt.com
-Project-URL: Repository, https://github.com/dbt-labs/dbt-adapters.git
+Project-URL: Repository, https://github.com/dbt-labs/dbt-adapters.git#subdirectory=dbt-adapters
 Project-URL: Issues, https://github.com/dbt-labs/dbt-adapters/issues
-Project-URL: Changelog, https://github.com/dbt-labs/dbt-adapters/blob/main/CHANGELOG.md
+Project-URL: Changelog, https://github.com/dbt-labs/dbt-adapters/blob/main/dbt-adapters/CHANGELOG.md
 Author-email: dbt Labs <info@dbtlabs.com>
 Maintainer-email: dbt Labs <info@dbtlabs.com>
 License-File: LICENSE

{dbt_adapters-1.13.2.dist-info → dbt_adapters-1.14.0.dist-info}/RECORD

@@ -1,5 +1,4 @@
-dbt/__init__.py,sha256=iY4jdvOxcDhkdr5FiyOTZPHadKtMZDQ-qC6Fw6_EHPM,277
-dbt/adapters/__about__.py,sha256=Cuq7FXEXm6Gn16RqHt8PiAzA3B1au2WWkMt2zQMOb9c,19
+dbt/adapters/__about__.py,sha256=jgA5fU_XZ5Gv-NyYGvOeyOvgy8rP58A_XiIlWHtvbZo,19
 dbt/adapters/__init__.py,sha256=3noHsg-64qI0_Pw6OR9F7l1vU2_qrJvinq8POTtuaZM,252
 dbt/adapters/cache.py,sha256=WGy4ewnz-J13LverTACBW2iFhGswrWLgm-wiBrQnMzo,20084
 dbt/adapters/capability.py,sha256=M3FkC9veKnNB7a7uQyl7EHX_AGNXPChbHAkcY4cgXCY,2534
@@ -12,7 +11,7 @@ dbt/adapters/base/README.md,sha256=muHQntC07Lh6L1XfVgwKhV5RltOPBLYPdQqd8_7l34c,5
 dbt/adapters/base/__init__.py,sha256=Nc8lQVkOzAqdcxk4cw4E_raxN9CAWMwhQx4STdiicxg,456
 dbt/adapters/base/column.py,sha256=Uj20UixoxCn2rlv4QDNONyys6CDkDFyG3anCXKf0T2c,5350
 dbt/adapters/base/connections.py,sha256=-C5dOwGgMKH8n_v6wjwOxV7chBdS0GjOGwNQCUbhhWc,16951
-dbt/adapters/base/impl.py,sha256=c-tUGbkZjXfKtc7gBK2qlJITdYINJoCQu75ckBFNS8I,74803
+dbt/adapters/base/impl.py,sha256=bzwmhB_M5SaYNKjUuS6ELzIjIxFNwOdmM85t7_V1B0Y,74919
 dbt/adapters/base/meta.py,sha256=IKqviGf7gK_qGtrn0t8NaSdUaw8g_M8SjICacMvNwGY,5702
 dbt/adapters/base/plugin.py,sha256=rm0GjNHnWM2mn0GJOjciZLwn-02xlzWCoMT9u-epwP0,1076
 dbt/adapters/base/query_headers.py,sha256=UluGd9IYCYkoMiDi5Yx_lnrCOSjWppjwRro4SIGgx8I,3496
@@ -89,14 +88,14 @@ dbt/include/global_project/macros/materializations/models/clone/create_or_replac
 dbt/include/global_project/macros/materializations/models/incremental/column_helpers.sql,sha256=hslQlGKW0oW97srfugsFVRR-L6RrzRcnwr3uLhzI0X4,2577
 dbt/include/global_project/macros/materializations/models/incremental/incremental.sql,sha256=8gyBXan-saJ9GTSa8d05vMa-RSwyZ7pStOeHJpHU4BI,4374
 dbt/include/global_project/macros/materializations/models/incremental/is_incremental.sql,sha256=Sm1TqOeqcCQofj3REFcA97yukPB1J_mClDd55r5GewE,478
-dbt/include/global_project/macros/materializations/models/incremental/merge.sql,sha256=Xg5-Gc9jHego-wpdfg6yEIQv7EClz6-xcJEeFXuZiwQ,5197
+dbt/include/global_project/macros/materializations/models/incremental/merge.sql,sha256=STmUSjqR253tq5FcDvFeCPPch4oN2UVi4dxoyFFAq5c,5426
 dbt/include/global_project/macros/materializations/models/incremental/on_schema_change.sql,sha256=EOgcrYhwOGVPnyaBu7kIfe8LTOYVOu-AhxMtBs8ETpQ,4927
 dbt/include/global_project/macros/materializations/models/incremental/strategies.sql,sha256=ORGWiYfj-b3_VIps9FDlyx-Q4A2hZzX2aYLocW8b6pU,2613
 dbt/include/global_project/macros/materializations/seeds/helpers.sql,sha256=Y15ej-D3gm1ExIOMNT208q43gRk8d985WQBuGSooNL0,3920
 dbt/include/global_project/macros/materializations/seeds/seed.sql,sha256=YSoGzVO3iIUiOKIUM9G7yApGLFH4O9bv_d4KjHo3p4Q,2155
-dbt/include/global_project/macros/materializations/snapshots/helpers.sql,sha256=-3fPrZylQCT3nYfRq1bb9C__9wnA91i3lXI__bWmpkk,10843
+dbt/include/global_project/macros/materializations/snapshots/helpers.sql,sha256=9Oj_60XhwEByrryf16YQN9J853dCHnXChSyjI_t8kX4,11110
 dbt/include/global_project/macros/materializations/snapshots/snapshot.sql,sha256=clIZtCE7vvOXxzz1t2KlmPZM7AuSGsK7MInspo0N5Qg,4043
-dbt/include/global_project/macros/materializations/snapshots/snapshot_merge.sql,sha256=-uCvd2_E4AfWWEBRyQLiGCpuHgOG-MczlbLIWyGfAzM,1287
+dbt/include/global_project/macros/materializations/snapshots/snapshot_merge.sql,sha256=WaGQCuv4o_qxBw7b2KQvUnSg0UkPklwAQHK1-QngN_M,1369
 dbt/include/global_project/macros/materializations/snapshots/strategies.sql,sha256=AfIsRiw0YnQym5wUiWR2JpiEEky4_WBTpTtE0HJvpZw,6928
 dbt/include/global_project/macros/materializations/tests/helpers.sql,sha256=rxUxDZm4EvrDbi0H_ePghE34_QLmxGEY2o_LTMc9CU0,1731
 dbt/include/global_project/macros/materializations/tests/test.sql,sha256=Rz3O_3dWHlIofG3d2CwsP2bXFimRZUIwOevyB0iz1J4,1831
@@ -142,6 +141,7 @@ dbt/include/global_project/macros/utils/date_spine.sql,sha256=to62irsceR0IjA452T
 dbt/include/global_project/macros/utils/date_trunc.sql,sha256=N7eDEgKVq6BQ9qUeIMJ_yKQv5QTjIWZ6k2oMWeGlqQU,234
 dbt/include/global_project/macros/utils/dateadd.sql,sha256=-t0IDuV01WOMNsuPjyBp9D-2uvJAdhgi3kE8JIL9Jhc,374
 dbt/include/global_project/macros/utils/datediff.sql,sha256=O94A5XE3sWsdxfwlNODef0BYoaJNGJP-OmurzKZ8qz0,344
+dbt/include/global_project/macros/utils/equals.sql,sha256=xYbyRqXbgU9kpMKh9oBuhCuIYnhKum_3MP7wWmzw7ps,436
 dbt/include/global_project/macros/utils/escape_single_quotes.sql,sha256=1KCciqp1m-xTnmxz73N1r8oZm2oBwq3Nr0NIayyPZvM,343
 dbt/include/global_project/macros/utils/except.sql,sha256=Hf8isn7k8fYbkxtm6wygo-v9uy-Nzlvt07LMfgKxHN4,147
 dbt/include/global_project/macros/utils/generate_series.sql,sha256=abXuCTtmf0WmnDqiCSmYOm6Ha3RutwpmTixfcFTJJeQ,1216
@@ -157,7 +157,7 @@ dbt/include/global_project/macros/utils/right.sql,sha256=EwNG98CAFIwNDmarwopf7Rk
 dbt/include/global_project/macros/utils/safe_cast.sql,sha256=1mswwkDACmIi1I99JKb_-vq3kjMe4HhMRV70mW8Bt4Y,298
 dbt/include/global_project/macros/utils/split_part.sql,sha256=fXEIS0oIiYR7-4lYbb0QbZdG-q2TpV63AFd1ky4I5UM,714
 dbt/include/global_project/tests/generic/builtin.sql,sha256=p94xdyPwb2TlxgLBqCfrcRfJ1QNgsjPvBm8f0Q5eqZM,1022
-dbt_adapters-1.13.2.dist-info/METADATA,sha256=CvDe6AlXUKv9aSjG3R1kzd4-FPh787A8VI7dbOum80Y,2576
-dbt_adapters-1.13.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dbt_adapters-1.13.2.dist-info/licenses/LICENSE,sha256=9yjigiJhWcCZvQjdagGKDwrRph58QWc5P2bVSQwXo6s,11344
-dbt_adapters-1.13.2.dist-info/RECORD,,
+dbt_adapters-1.14.0.dist-info/METADATA,sha256=ejgZ1h7Wc-mKL7ytZ-a1HWUlFG5rDLAxnuwDEftrikA,2638
+dbt_adapters-1.14.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dbt_adapters-1.14.0.dist-info/licenses/LICENSE,sha256=9yjigiJhWcCZvQjdagGKDwrRph58QWc5P2bVSQwXo6s,11344
+dbt_adapters-1.14.0.dist-info/RECORD,,

dbt/__init__.py

@@ -1,6 +0,0 @@
-# N.B.
-# This will add to the package’s __path__ all subdirectories of directories on sys.path named after the package which effectively combines both modules into a single namespace (dbt.adapters)
-
-from pkgutil import extend_path
-
-__path__ = extend_path(__path__, __name__)