dbt-adapters 1.14.8__tar.gz → 1.15__tar.gz

dbt_adapters-1.15/.changes/1.15.md

@@ -0,0 +1,15 @@
+## dbt-adapters 1.15 - May 19, 2025
+
+### Features
+
+- Overridable default query comment append behavior ([#1065](https://github.com/dbt-labs/dbt-adapters/issues/1065))
+
+### Fixes
+
+- Respect the `limit` config when storing test failures ([#373](https://github.com/dbt-labs/dbt-adapters/issues/373))
+- Keep `limit` as a required parameter in `get_test_sql` ([#1051](https://github.com/dbt-labs/dbt-adapters/issues/1051))
+- Fix an issue with snapshots in new_record mode when check columns are used. ([#1068](https://github.com/dbt-labs/dbt-adapters/issues/1068))
+
+### Under the Hood
+
+- Keep table and column metadata as strings ([#1056](https://github.com/dbt-labs/dbt-adapters/issues/1056))

{dbt_adapters-1.14.8 → dbt_adapters-1.15}/CHANGELOG.md

@@ -10,9 +10,25 @@ and is generated by [Changie](https://github.com/miniscruff/changie)
 - Do not edit this file directly. This file is auto-generated using [changie](https://github.com/miniscruff/changie)
 - For details on how to document a change, see the [contributing guide](/CONTRIBUTING.md#changelog-entry)
 
-## dbt-adapters 1.14.8 - April 25, 2025
+## dbt-adapters 1.15 - May 19, 2025
+
+### Features
+
+- Overridable default query comment append behavior ([#1065](https://github.com/dbt-labs/dbt-adapters/issues/1065))
+
+### Fixes
 
+- Respect the `limit` config when storing test failures ([#373](https://github.com/dbt-labs/dbt-adapters/issues/373))
+- Keep `limit` as a required parameter in `get_test_sql` ([#1051](https://github.com/dbt-labs/dbt-adapters/issues/1051))
+- Fix an issue with snapshots in new_record mode when check columns are used. ([#1068](https://github.com/dbt-labs/dbt-adapters/issues/1068))
 
+### Under the Hood
+
+- Keep table and column metadata as strings ([#1056](https://github.com/dbt-labs/dbt-adapters/issues/1056))
+
+
+
+## dbt-adapters 1.14.8 - April 25, 2025
 
 ## dbt-adapters 1.14.7 - April 24, 2025
 

{dbt_adapters-1.14.8 → dbt_adapters-1.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbt-adapters
-Version: 1.14.8
+Version: 1.15
 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
@@ -23,6 +23,7 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.9.0
 Requires-Dist: agate<2.0,>=1.0
 Requires-Dist: dbt-common<2.0,>=1.13
+Requires-Dist: dbt-protos<2.0,>=1.0.291
 Requires-Dist: mashumaro[msgpack]<3.15,>=3.9
 Requires-Dist: protobuf<6.0,>=5.0
 Requires-Dist: pytz>=2015.7

{dbt_adapters-1.14.8 → dbt_adapters-1.15}/hatch.toml

@@ -8,8 +8,9 @@ sources = ["src"]
 [envs.default]
 dependencies = [
     "dbt_common @ git+https://github.com/dbt-labs/dbt-common.git",
+    "ddtrace==2.3.0",
     'pre-commit==3.7.0',
-    "pytest",
+    "pytest>=7.0,<8.0",
     "pytest-dotenv",
     "pytest-xdist",
 ]
@@ -47,3 +48,25 @@ check-sdist = [
     "pip freeze | grep dbt-adapters",
 ]
 protobuf = "protoc -I=./dbt/adapters/events --python_out=./dbt/adapters/events ./dbt/adapters/events/adapter_types.proto"
+
+[envs.ci]
+dependencies = [
+    "dbt_common @ git+https://github.com/dbt-labs/dbt-common.git",
+    "ddtrace==2.3.0",
+    "pytest>=7.0,<8.0",
+    "pytest-dotenv",
+    "pytest-xdist",
+]
+[envs.ci.scripts]
+unit-tests = "python -m pytest tests/unit --ddtrace"
+
+[envs.cd]
+pre-install-commands = []
+dependencies = [
+    "ddtrace==2.3.0",
+    "pytest>=7.0,<8.0",
+    "pytest-dotenv",
+    "pytest-xdist",
+]
+[envs.cd.scripts]
+unit-tests = "python -m pytest tests/unit --ddtrace"

{dbt_adapters-1.14.8 → dbt_adapters-1.15}/pyproject.toml

@@ -28,6 +28,7 @@ classifiers = [
 ]
 dependencies = [
     "dbt-common>=1.13,<2.0",
+    "dbt-protos>=1.0.291,<2.0",
     "pytz>=2015.7",
     # installed via dbt-common but used directly
     "agate>=1.0,<2.0",

dbt_adapters-1.15/src/dbt/adapters/__about__.py

@@ -0,0 +1 @@
+version = "1.15"

{dbt_adapters-1.14.8 → dbt_adapters-1.15}/src/dbt/adapters/base/impl.py

@@ -1289,7 +1289,17 @@ class BaseAdapter(metaclass=AdapterMeta):
         table = table_from_rows(
             table.rows,
             table.column_names,
-            text_only_columns=["table_database", "table_schema", "table_name"],
+            text_only_columns=[
+                "table_database",
+                "table_schema",
+                "table_name",
+                "table_type",
+                "table_comment",
+                "table_owner",
+                "column_name",
+                "column_type",
+                "column_comment",
+            ],
         )
         return table.where(_catalog_filter_schemas(used_schemas))
 

{dbt_adapters-1.14.8 → dbt_adapters-1.15}/src/dbt/adapters/base/query_headers.py

@@ -54,6 +54,8 @@ QueryStringFunc = Callable[[str, Optional[QueryHeaderContextWrapper]], str]
 
 
 class MacroQueryStringSetter:
+    DEFAULT_QUERY_COMMENT_APPEND = False
+
     def __init__(
         self, config: AdapterRequiredConfig, query_header_context: Dict[str, Any]
     ) -> None:
@@ -95,7 +97,10 @@ class MacroQueryStringSetter:
             wrapped = QueryHeaderContextWrapper(query_header_context)
         comment_str = self.generator(name, wrapped)
 
-        append = False
-        if isinstance(self.config.query_comment, QueryComment):
+        append = self.DEFAULT_QUERY_COMMENT_APPEND
+        if (
+            isinstance(self.config.query_comment, QueryComment)
+            and self.config.query_comment.append is not None
+        ):
             append = self.config.query_comment.append
         self.comment.set(comment_str, append)

{dbt_adapters-1.14.8 → dbt_adapters-1.15}/src/dbt/adapters/catalogs/_client.py

@@ -28,7 +28,7 @@ class CatalogIntegrationClient:
 
     def __init__(self, supported_catalogs: Iterable[Type[CatalogIntegration]]):
         self.__supported_catalogs: Dict[str, Type[CatalogIntegration]] = {
-            catalog.catalog_type: catalog for catalog in supported_catalogs
+            catalog.catalog_type.casefold(): catalog for catalog in supported_catalogs
         }
         self.__catalog_integrations: Dict[str, CatalogIntegration] = {}
 
@@ -47,7 +47,7 @@ class CatalogIntegrationClient:
 
     def __catalog_integration_factory(self, catalog_type: str) -> Type[CatalogIntegration]:
         try:
-            return self.__supported_catalogs[catalog_type]
+            return self.__supported_catalogs[catalog_type.casefold()]
         except KeyError as e:
             raise DbtCatalogIntegrationNotSupportedError(
                 catalog_type, self.__supported_catalogs.keys()

{dbt_adapters-1.14.8 → dbt_adapters-1.15}/src/dbt/adapters/catalogs/_exceptions.py

@@ -25,8 +25,8 @@ class DbtCatalogIntegrationNotSupportedError(DbtConfigError):
     def __init__(self, catalog_type: str, supported_catalog_types: Iterable[str]) -> None:
         self.catalog_type = catalog_type
         msg = (
-            f"Catalog type is not supported."
-            f"Received: {catalog_type}"
+            f"Catalog type is not supported.\n"
+            f"Received: {catalog_type}\n"
             f"Expected one of: {', '.join(supported_catalog_types)}"
         )
         super().__init__(msg)

{dbt_adapters-1.14.8 → dbt_adapters-1.15}/src/dbt/adapters/contracts/connection.py

@@ -217,7 +217,7 @@ DEFAULT_QUERY_COMMENT = """
 @dataclass
 class QueryComment(dbtClassMixin):
     comment: str = DEFAULT_QUERY_COMMENT
-    append: bool = False
+    append: Optional[bool] = None
     job_label: bool = field(default=False, metadata={"alias": "job-label"})
 
 

{dbt_adapters-1.14.8 → dbt_adapters-1.15}/src/dbt/adapters/events/README.md

@@ -8,13 +8,7 @@ The event module provides types that represent what is happening in dbt in `even
 When events are processed via `fire_event`, nearly everything is logged. Whether or not the user has enabled the debug flag, all debug messages are still logged to the file. However, some events are particularly time consuming to construct because they return a huge amount of data. Today, the only messages in this category are cache events and are only logged if the `--log-cache-events` flag is on. This is important because these messages should not be created unless they are going to be logged, because they cause a noticable performance degredation. These events use a "fire_event_if" functions.
 
 # Adding a New Event
-* Add a new message in types.proto, and a second message with the same name + "Msg". The "Msg" message should have two fields, an "info" field of EventInfo, and a "data" field referring to the message name without "Msg"
-* run the protoc compiler to update adapter_types_pb2.py:   make adapter_proto_types
-* Add a wrapping class in core/dbt/adapters/event/types.py with a Level superclass  plus code and message methods
-
-We have switched from using betterproto to using google protobuf, because of a lack of support for Struct fields in betterproto.
-
-The google protobuf interface is janky and very much non-Pythonic. The "generated" classes in types_pb2.py do not resemble regular Python classes. They do not have normal constructors; they can only be constructed empty. They can be "filled" by setting fields individually or using a json_format method like ParseDict.  We have wrapped the logging events with a class (in types.py) which allows using a constructor -- keywords only, no positional parameters.
+All protos have been moved into the central protos repository. To edit an event proto, edit https://github.com/dbt-labs/proto-python-public or open an issue on that repository.
 
 ## Required for Every Event
 

dbt_adapters-1.15/src/dbt/adapters/events/adapter_types_pb2.py

@@ -0,0 +1,2 @@
+# preserving import path during dbtlabs.proto refactor
+from dbtlabs.proto.public.v1.fields.adapter_types_pb2 import *  # noqa

{dbt_adapters-1.14.8 → dbt_adapters-1.15}/src/dbt/adapters/events/base_types.py

@@ -1,14 +1,10 @@
-# Aliasing common Level classes in order to make custom, but not overly-verbose versions that have PROTO_TYPES_MODULE set to the adapter-specific generated types_pb2 module
-from dbt_common.events.base_types import (
-    BaseEvent,
-    DebugLevel as CommonDebugLevel,
-    DynamicLevel as CommonDynamicLevel,
-    ErrorLevel as CommonErrorLevel,
-    InfoLevel as CommonInfoLevel,
-    TestLevel as CommonTestLevel,
-    WarnLevel as CommonWarnLevel,
-)
-
+from dbt_common.events.base_types import BaseEvent
+from dbt_common.events.base_types import DebugLevel as CommonDebugLevel
+from dbt_common.events.base_types import DynamicLevel as CommonDynamicLevel
+from dbt_common.events.base_types import ErrorLevel as CommonErrorLevel
+from dbt_common.events.base_types import InfoLevel as CommonInfoLevel
+from dbt_common.events.base_types import TestLevel as CommonTestLevel
+from dbt_common.events.base_types import WarnLevel as CommonWarnLevel
 from dbt.adapters.events import adapter_types_pb2
 
 

{dbt_adapters-1.14.8 → dbt_adapters-1.15}/src/dbt/adapters/events/types.py

@@ -1,5 +1,3 @@
-from dbt_common.ui import line_wrap_message, warning_tag
-
 from dbt.adapters.events.base_types import (
     DebugLevel,
     DynamicLevel,
@@ -7,6 +5,7 @@ from dbt.adapters.events.base_types import (
     InfoLevel,
     WarnLevel,
 )
+from dbt_common.ui import line_wrap_message, warning_tag
 
 
 def format_adapter_message(name, base_msg, args) -> str:

{dbt_adapters-1.14.8 → dbt_adapters-1.15}/src/dbt/adapters/sql/connections.py

@@ -102,7 +102,8 @@ class SQLConnectionManager(BaseConnectionManager):
 
                 fire_event(
                     AdapterEventDebug(
-                        message=f"Got a retryable error {type(e)}. {retry_limit - attempt} retries left. Retrying in 1 second.\nError:\n{e}"
+                        base_msg=f"Got a retryable error {type(e)}. {retry_limit - attempt} retries left. "
+                        f"Retrying in 1 second.\nError:\n{e}"
                     )
                 )
                 time.sleep(1)

{dbt_adapters-1.14.8 → dbt_adapters-1.15}/src/dbt/include/global_project/macros/materializations/snapshots/helpers.sql

@@ -109,7 +109,9 @@
         left outer join snapshotted_data
             on {{ unique_key_join_on(strategy.unique_key, "snapshotted_data", "source_data") }}
             where {{ unique_key_is_null(strategy.unique_key, "snapshotted_data") }}
-            or ({{ unique_key_is_not_null(strategy.unique_key, "snapshotted_data") }} and ({{ strategy.row_changed }})
+            or ({{ unique_key_is_not_null(strategy.unique_key, "snapshotted_data") }} and (
+               {{ strategy.row_changed }} {%- if strategy.hard_deletes == 'new_record' -%} or snapshotted_data.{{ columns.dbt_is_deleted }} = 'True' {% endif %}
+            )
 
         )
 
@@ -129,7 +131,7 @@
         join snapshotted_data
             on {{ unique_key_join_on(strategy.unique_key, "snapshotted_data", "source_data") }}
         where (
-            {{ strategy.row_changed }}
+            {{ strategy.row_changed }}  {%- if strategy.hard_deletes == 'new_record' -%} or snapshotted_data.{{ columns.dbt_is_deleted }} = 'True' {% endif %}
         )
     )
 

{dbt_adapters-1.14.8 → dbt_adapters-1.15}/src/dbt/include/global_project/macros/materializations/tests/test.sql

@@ -1,6 +1,11 @@
 {%- materialization test, default -%}
 
   {% set relations = [] %}
+  {% set limit = config.get('limit') %}
+
+  {% set sql_with_limit %}
+    {{ get_limit_subquery_sql(sql, limit) }}
+  {% endset %}
 
   {% if should_store_failures() %}
 
@@ -26,11 +31,12 @@
     {% endif %}
 
     {% call statement(auto_begin=True) %}
-        {{ get_create_sql(target_relation, sql) }}
+        {{ get_create_sql(target_relation, sql_with_limit) }}
     {% endcall %}
 
     {% do relations.append(target_relation) %}
 
+    {# Since the test failures have already been saved to the database, reuse that result rather than querying again #}
     {% set main_sql %}
         select *
         from {{ target_relation }}
@@ -40,18 +46,18 @@
 
   {% else %}
 
-      {% set main_sql = sql %}
+      {% set main_sql = sql_with_limit %}
 
   {% endif %}
 
-  {% set limit = config.get('limit') %}
   {% set fail_calc = config.get('fail_calc') %}
   {% set warn_if = config.get('warn_if') %}
   {% set error_if = config.get('error_if') %}
 
   {% call statement('main', fetch_result=True) -%}
 
-    {{ get_test_sql(main_sql, fail_calc, warn_if, error_if, limit)}}
+    {# The limit has already been included above, and we do not want to duplicate it again. We also want to be safe for macro overrides treating `limit` as a required parameter. #}
+    {{ get_test_sql(main_sql, fail_calc, warn_if, error_if, limit=none)}}
 
   {%- endcall %}
 

dbt_adapters-1.14.8/src/dbt/adapters/__about__.py

@@ -1 +0,0 @@
-version = "1.14.8"