dbt-adapters 1.16.1__py3-none-any.whl → 1.16.3__py3-none-any.whl

dbt/adapters/__about__.py

@@ -1 +1 @@
-version = "1.16.1"
+version = "1.16.3"

dbt/adapters/base/impl.py

@@ -103,7 +103,9 @@ from dbt.adapters.exceptions import (
     UnexpectedNonTimestampError,
 )
 from dbt.adapters.protocol import AdapterConfig, MacroContextGeneratorCallable
+from dbt.adapters.events.logging import AdapterLogger
 
+logger = AdapterLogger(__name__)
 if TYPE_CHECKING:
     import agate
 
@@ -153,15 +155,25 @@ def _catalog_filter_schemas(
     """Return a function that takes a row and decides if the row should be
     included in the catalog output.
     """
-    schemas = frozenset((d.lower(), s.lower()) for d, s in used_schemas)
+    schemas = frozenset(
+        (d.lower(), s.lower()) for d, s in used_schemas if d is not None and s is not None
+    )
+    if null_schemas := [d for d, s in used_schemas if d is None or s is None]:
+        logger.debug(
+            f"used_schemas contains None for either database or schema, skipping {null_schemas}"
+        )
 
     def test(row: "agate.Row") -> bool:
         table_database = _expect_row_value("table_database", row)
         table_schema = _expect_row_value("table_schema", row)
         # the schema may be present but None, which is not an error and should
         # be filtered out
+
         if table_schema is None:
             return False
+        if table_database is None:
+            logger.debug(f"table_database is None, skipping {table_schema}")
+            return False
         return (table_database.lower(), table_schema.lower()) in schemas
 
     return test

dbt/include/global_project/macros/adapters/columns.sql

@@ -16,6 +16,13 @@
   {{ return(columns) }}
 {% endmacro %}
 
+{%- macro get_list_of_column_names(columns) -%}
+  {% set col_names = [] %}
+  {% for col in columns %}
+    {% do col_names.append(col.name) %}
+  {% endfor %}
+  {{ return(col_names) }}
+{% endmacro %}
 
 {% macro get_empty_subquery_sql(select_sql, select_sql_header=none) -%}
   {{ return(adapter.dispatch('get_empty_subquery_sql', 'dbt')(select_sql, select_sql_header)) }}
@@ -123,11 +130,11 @@
      alter {{ relation.type }} {{ relation.render() }}
 
             {% for column in add_columns %}
-               add column {{ column.name }} {{ column.data_type }}{{ ',' if not loop.last }}
+               add column {{ column.quoted }} {{ column.data_type }}{{ ',' if not loop.last }}
             {% endfor %}{{ ',' if add_columns and remove_columns }}
 
             {% for column in remove_columns %}
-                drop column {{ column.name }}{{ ',' if not loop.last }}
+                drop column {{ column.quoted }}{{ ',' if not loop.last }}
             {% endfor %}
 
   {%- endset -%}

dbt/include/global_project/macros/materializations/models/clone/clone.sql

@@ -32,15 +32,15 @@
       {% endif %}
 
       -- as a general rule, data platforms that can clone tables can also do atomic 'create or replace'
-      {% call statement('main') %}
-          {% if target_relation and defer_relation and target_relation == defer_relation %}
-              {{ log("Target relation and defer relation are the same, skipping clone for relation: " ~ target_relation.render()) }}
-          {% else %}
-              {{ create_or_replace_clone(target_relation, defer_relation) }}
-          {% endif %}
-
-      {% endcall %}
-
+      {% if target_relation.database == defer_relation.database and
+            target_relation.schema == defer_relation.schema and
+            target_relation.identifier == defer_relation.identifier %}
+        {{ log("Target relation and defer relation are the same, skipping clone for relation: " ~ target_relation.render()) }}
+      {% else %}
+        {% call statement('main') %}
+            {{ create_or_replace_clone(target_relation, defer_relation) }}
+        {% endcall %}
+      {% endif %}
       {% set should_revoke = should_revoke(existing_relation, full_refresh_mode=True) %}
       {% do apply_grants(target_relation, grant_config, should_revoke=should_revoke) %}
       {% do persist_docs(target_relation, model) %}

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

@@ -8,7 +8,7 @@
 {% macro default__create_columns(relation, columns) %}
   {% for column in columns %}
     {% call statement() %}
-      alter table {{ relation.render() }} add column "{{ column.name }}" {{ column.data_type }};
+      alter table {{ relation.render() }} add column {{ adapter.quote(column.name) }} {{ column.data_type }};
     {% endcall %}
   {% endfor %}
 {% endmacro %}
@@ -165,14 +165,23 @@
     {%- endif %}
 
     {%- if strategy.hard_deletes == 'new_record' %}
+        {% set snapshotted_cols = get_list_of_column_names(get_columns_in_relation(target_relation)) %}
         {% set source_sql_cols = get_column_schema_from_query(source_sql) %}
     ,
     deletion_records as (
 
         select
             'insert' as dbt_change_type,
+            {#
+                If a column has been added to the source it won't yet exist in the
+                snapshotted table so we insert a null value as a placeholder for the column.
+             #}
             {%- for col in source_sql_cols -%}
+            {%- if col.name in snapshotted_cols -%}
             snapshotted_data.{{ adapter.quote(col.column) }},
+            {%- else -%}
+            NULL as {{ adapter.quote(col.column) }},
+            {%- endif -%}
             {% endfor -%}
             {%- if strategy.unique_key | is_list -%}
                 {%- for key in strategy.unique_key -%}

{dbt_adapters-1.16.1.dist-info → dbt_adapters-1.16.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbt-adapters
-Version: 1.16.1
+Version: 1.16.3
 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/tree/main/dbt-adapters
 Project-URL: Documentation, https://docs.getdbt.com

{dbt_adapters-1.16.1.dist-info → dbt_adapters-1.16.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-dbt/adapters/__about__.py,sha256=Hh-IeRo2Db381unyQS1QCxvvOONgXpXkpu3GJTYa8b8,19
+dbt/adapters/__about__.py,sha256=WY0jp7TYTHaG2jpqqG99tmrgb7dBHylc_TYeEGs6j3s,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
@@ -11,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=0RqSVYNFVldfxjJVCBhULdgrtdUgX2daVo9fQCDcIT8,78486
+dbt/adapters/base/impl.py,sha256=_azN61jgWam6SWFhTJGYTI7H3ME9IQDUjv4A2dyf-mc,78968
 dbt/adapters/base/meta.py,sha256=c5j0qeGec1cAi-IlVV_JkhMk01p5XqbtGj02uxGP1S4,5686
 dbt/adapters/base/plugin.py,sha256=rm0GjNHnWM2mn0GJOjciZLwn-02xlzWCoMT9u-epwP0,1076
 dbt/adapters/base/query_headers.py,sha256=rHgux9b_vPp_xRsg8QU3NE202Hho4i4zO9u9Gx_BCF4,3651
@@ -64,7 +64,7 @@ dbt/include/global_project/__init__.py,sha256=-0HL5OkeJSrxglm1Y-UltTiBPY2BbWx8Zp
 dbt/include/global_project/dbt_project.yml,sha256=RTtOhnBpEL0gbd1GlpxuVr6eZJBPvgWfNw-F88sKQ-w,109
 dbt/include/global_project/docs/overview.md,sha256=VuObM4pcS-TvwYeAjjUbe0TBhEnxf6g30EPWrGjya_w,1824
 dbt/include/global_project/macros/adapters/apply_grants.sql,sha256=3NUJLWmNE0ZAWxc1LuIpo6-dTfLEBjX1Os5BdDb_IOQ,6861
-dbt/include/global_project/macros/adapters/columns.sql,sha256=21cb0Q8A3oDbajV7oL06arDcmg-YuvWRmQ-07KeI-dk,5483
+dbt/include/global_project/macros/adapters/columns.sql,sha256=3TU-Bd5legmB2iEon_PbIO_HKGFKrvQT3Eb1IGtF_1Y,5685
 dbt/include/global_project/macros/adapters/freshness.sql,sha256=bl2Kn7s2pDMzrJWeLXYyUVYXDmloLxntjOgyWSDcgCs,1200
 dbt/include/global_project/macros/adapters/indexes.sql,sha256=DasPn32Cm0OZyjBPBWzL4BpK9PZ3xF_Pu8Nh4NgASaw,1366
 dbt/include/global_project/macros/adapters/metadata.sql,sha256=meNIc3z4lXdh1lDb-K1utKb8VzAVuN23E6XWgMZGDhQ,3512
@@ -89,7 +89,7 @@ dbt/include/global_project/macros/materializations/models/materialized_view.sql,
 dbt/include/global_project/macros/materializations/models/table.sql,sha256=F9ogmZofhPdzKwhhFJ_GfI5QRXQxLjTl6xTiCgulQ9g,2682
 dbt/include/global_project/macros/materializations/models/view.sql,sha256=LPqM3aTsWiAalFz322aTpqKqCdl4hxN8ubcwXZIIDDw,3249
 dbt/include/global_project/macros/materializations/models/clone/can_clone_table.sql,sha256=YVq2f574IxMDuEv5rbaTvUpLLqc-jQfyOgBQJQGWcmk,187
-dbt/include/global_project/macros/materializations/models/clone/clone.sql,sha256=X85U0zwq_OINxeZ7JDer9i3BgQZvgGM-tKTvITrQx5s,2716
+dbt/include/global_project/macros/materializations/models/clone/clone.sql,sha256=hd6AFfjtVWqq10okMnCeBCnRxid0PvY7prIYFA7Wt44,2813
 dbt/include/global_project/macros/materializations/models/clone/create_or_replace_clone.sql,sha256=qr33DwFOpRG0wGVsGvr63-MexYMNZC9xKdGOPmICp_c,367
 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=yOG-Rsv_j6JhGIHdfFk77_DoILFgFqsLN27R5LdCnZM,4546
@@ -99,7 +99,7 @@ dbt/include/global_project/macros/materializations/models/incremental/on_schema_
 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=HhDv-rNYE8De4cJU3PdjKx5t49otXcgepSfCdVmiD3Q,11988
+dbt/include/global_project/macros/materializations/snapshots/helpers.sql,sha256=EdKKm0_uEot5msQbs77iFdTJh-HmuV8hgTLVDT3MNo0,12468
 dbt/include/global_project/macros/materializations/snapshots/snapshot.sql,sha256=clIZtCE7vvOXxzz1t2KlmPZM7AuSGsK7MInspo0N5Qg,4043
 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
@@ -163,7 +163,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.16.1.dist-info/METADATA,sha256=j7EW34DwGfvNnf5YoaP-69G6BmxbfWFzsTxubFWuZ0U,4534
-dbt_adapters-1.16.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dbt_adapters-1.16.1.dist-info/licenses/LICENSE,sha256=9yjigiJhWcCZvQjdagGKDwrRph58QWc5P2bVSQwXo6s,11344
-dbt_adapters-1.16.1.dist-info/RECORD,,
+dbt_adapters-1.16.3.dist-info/METADATA,sha256=naEgTVoEUvyA4qDpzYSBo3Sga5Cek77wMQXIxhwzmGk,4534
+dbt_adapters-1.16.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dbt_adapters-1.16.3.dist-info/licenses/LICENSE,sha256=9yjigiJhWcCZvQjdagGKDwrRph58QWc5P2bVSQwXo6s,11344
+dbt_adapters-1.16.3.dist-info/RECORD,,