dbt-adapters 1.10.3__tar.gz → 1.11.0__tar.gz

{dbt_adapters-1.10.3 → dbt_adapters-1.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dbt-adapters
-Version: 1.10.3
+Version: 1.11.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: Documentation, https://docs.getdbt.com
@@ -21,9 +21,9 @@ Classifier: Programming Language :: Python :: 3.11
 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: mashumaro[msgpack]<3.15,>=3.9
-Requires-Dist: protobuf<6.0,>=5.0
+Requires-Dist: dbt-common<2.0,>=1.11
+Requires-Dist: mashumaro[msgpack]<4.0,>=3.0
+Requires-Dist: protobuf<5.0,>=3.0
 Requires-Dist: pytz>=2015.7
 Requires-Dist: typing-extensions<5.0,>=4.0
 Description-Content-Type: text/markdown
@@ -32,7 +32,7 @@ Description-Content-Type: text/markdown
   <img src="https://raw.githubusercontent.com/dbt-labs/dbt/ec7dee39f793aa4f7dd3dae37282cc87664813e4/etc/dbt-logo-full.svg" alt="dbt logo" width="500"/>
 </p>
 
-# dbt-adapters
+# dbt-tests-adapter
 
 This package is responsible for:
 
@@ -40,12 +40,10 @@ This package is responsible for:
 - caching information from databases
 - determining how relations are defined
 
-In this repo there is also our testing suite used for tesing adapter functionality
-
-# Adapters
-
 There are two major adapter types: base and sql
 
+# Directories
+
 ## `base`
 
 Defines the base implementation Adapters can use to build out full functionality.

{dbt_adapters-1.10.3 → dbt_adapters-1.11.0}/README.md

@@ -2,7 +2,7 @@
   <img src="https://raw.githubusercontent.com/dbt-labs/dbt/ec7dee39f793aa4f7dd3dae37282cc87664813e4/etc/dbt-logo-full.svg" alt="dbt logo" width="500"/>
 </p>
 
-# dbt-adapters
+# dbt-tests-adapter
 
 This package is responsible for:
 
@@ -10,12 +10,10 @@ This package is responsible for:
 - caching information from databases
 - determining how relations are defined
 
-In this repo there is also our testing suite used for tesing adapter functionality
-
-# Adapters
-
 There are two major adapter types: base and sql
 
+# Directories
+
 ## `base`
 
 Defines the base implementation Adapters can use to build out full functionality.

dbt_adapters-1.11.0/dbt/adapters/__about__.py

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

{dbt_adapters-1.10.3 → dbt_adapters-1.11.0}/dbt/adapters/base/impl.py

@@ -98,13 +98,6 @@ GET_CATALOG_MACRO_NAME = "get_catalog"
 GET_CATALOG_RELATIONS_MACRO_NAME = "get_catalog_relations"
 FRESHNESS_MACRO_NAME = "collect_freshness"
 GET_RELATION_LAST_MODIFIED_MACRO_NAME = "get_relation_last_modified"
-DEFAULT_BASE_BEHAVIOR_FLAGS = [
-    {
-        "name": "require_batched_execution_for_custom_microbatch_strategy",
-        "default": False,
-        "docs_url": "https://docs.getdbt.com/docs/build/incremental-microbatch",
-    }
-]
 
 
 class ConstraintSupport(str, Enum):
@@ -206,14 +199,6 @@ class FreshnessResponse(TypedDict):
     age: float  # age in seconds
 
 
-class SnapshotStrategy(TypedDict):
-    unique_key: Optional[str]
-    updated_at: Optional[str]
-    row_changed: Optional[str]
-    scd_id: Optional[str]
-    hard_deletes: Optional[str]
-
-
 class BaseAdapter(metaclass=AdapterMeta):
     """The BaseAdapter provides an abstract base class for adapters.
 
@@ -288,7 +273,8 @@ class BaseAdapter(metaclass=AdapterMeta):
         self.connections = self.ConnectionManager(config, mp_context)
         self._macro_resolver: Optional[MacroResolverProtocol] = None
         self._macro_context_generator: Optional[MacroContextGeneratorCallable] = None
-        self.behavior = DEFAULT_BASE_BEHAVIOR_FLAGS  # type: ignore
+        # this will be updated to include global behavior flags once they exist
+        self.behavior = []  # type: ignore
 
     ###
     # Methods to set / access a macro resolver
@@ -328,10 +314,14 @@ class BaseAdapter(metaclass=AdapterMeta):
     def _behavior_flags(self) -> List[BehaviorFlag]:
         """
         This method should be overwritten by adapter maintainers to provide platform-specific flags
-
-        The BaseAdapter should NOT include any global flags here as those should be defined via DEFAULT_BASE_BEHAVIOR_FLAGS
         """
-        return []
+        return [
+            {
+                "name": "require_batched_execution_for_custom_microbatch_strategy",
+                "default": False,
+                "docs_url": "https://docs.getdbt.com/docs/build/incremental-microbatch",
+            }
+        ]
 
     ###
     # Methods that pass through to the connection manager
@@ -803,8 +793,8 @@ class BaseAdapter(metaclass=AdapterMeta):
         columns = self.get_columns_in_relation(relation)
         names = set(c.name.lower() for c in columns)
         missing = []
-        # Note: we're not checking dbt_updated_at or dbt_is_deleted here because they
-        # aren't always present.
+        # Note: we're not checking dbt_updated_at here because it's not
+        # always present.
         for column in ("dbt_scd_id", "dbt_valid_from", "dbt_valid_to"):
             desired = column_names[column] if column_names else column
             if desired not in names:
@@ -813,28 +803,6 @@ class BaseAdapter(metaclass=AdapterMeta):
         if missing:
             raise SnapshotTargetNotSnapshotTableError(missing)
 
-    @available.parse_none
-    def assert_valid_snapshot_target_given_strategy(
-        self, relation: BaseRelation, column_names: Dict[str, str], strategy: SnapshotStrategy
-    ) -> None:
-        # Assert everything we can with the legacy function.
-        self.valid_snapshot_target(relation, column_names)
-
-        # Now do strategy-specific checks.
-        # TODO: Make these checks more comprehensive.
-        if strategy.get("hard_deletes", None) == "new_record":
-            columns = self.get_columns_in_relation(relation)
-            names = set(c.name.lower() for c in columns)
-            missing = []
-
-            for column in ("dbt_is_deleted",):
-                desired = column_names[column] if column_names else column
-                if desired not in names:
-                    missing.append(desired)
-
-            if missing:
-                raise SnapshotTargetNotSnapshotTableError(missing)
-
     @available.parse_none
     def expand_target_column_types(
         self, from_relation: BaseRelation, to_relation: BaseRelation
@@ -1610,14 +1578,8 @@ class BaseAdapter(metaclass=AdapterMeta):
         return ["append"]
 
     def builtin_incremental_strategies(self):
-        """
-        List of possible builtin strategies for adapters
-
-        Microbatch is added by _default_. It is only not added when the behavior flag
-        `require_batched_execution_for_custom_microbatch_strategy` is True.
-        """
         builtin_strategies = ["append", "delete+insert", "merge", "insert_overwrite"]
-        if not self.behavior.require_batched_execution_for_custom_microbatch_strategy.no_warn:
+        if self.behavior.require_batched_execution_for_custom_microbatch_strategy.no_warn:
             builtin_strategies.append("microbatch")
 
         return builtin_strategies
@@ -1825,29 +1787,6 @@ class BaseAdapter(metaclass=AdapterMeta):
         """
         return {}
 
-    @available.parse_none
-    @classmethod
-    def get_hard_deletes_behavior(cls, config):
-        """Check the hard_deletes config enum, and the legacy invalidate_hard_deletes
-        config flag in order to determine which behavior should be used for deleted
-        records in a snapshot. The default is to ignore them."""
-        invalidate_hard_deletes = config.get("invalidate_hard_deletes", None)
-        hard_deletes = config.get("hard_deletes", None)
-
-        if invalidate_hard_deletes is not None and hard_deletes is not None:
-            raise DbtValidationError(
-                "You cannot set both the invalidate_hard_deletes and hard_deletes config properties on the same snapshot."
-            )
-
-        if invalidate_hard_deletes or hard_deletes == "invalidate":
-            return "invalidate"
-        elif hard_deletes == "new_record":
-            return "new_record"
-        elif hard_deletes is None or hard_deletes == "ignore":
-            return "ignore"
-
-        raise DbtValidationError("Invalid setting for property hard_deletes.")
-
 
 COLUMNS_EQUAL_SQL = """
 with diff_count as (

{dbt_adapters-1.10.3 → dbt_adapters-1.11.0}/dbt/adapters/capability.py

@@ -21,9 +21,6 @@ class Capability(str, Enum):
     """Indicates support for getting catalog information including table-level and column-level metadata for a single
     relation."""
 
-    MicrobatchConcurrency = "MicrobatchConcurrency"
-    """Indicates support running the microbatch incremental materialization strategy concurrently across threads."""
-
 
 class Support(str, Enum):
     Unknown = "Unknown"

{dbt_adapters-1.10.3 → dbt_adapters-1.11.0}/dbt/adapters/events/adapter_types_pb2.py

@@ -1,22 +1,11 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# NO CHECKED-IN PROTOBUF GENCODE
 # source: adapter_types.proto
-# Protobuf Python Version: 5.28.3
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import runtime_version as _runtime_version
 from google.protobuf import symbol_database as _symbol_database
 from google.protobuf.internal import builder as _builder
-_runtime_version.ValidateProtobufRuntimeVersion(
-    _runtime_version.Domain.PUBLIC,
-    5,
-    28,
-    3,
-    '',
-    'adapter_types.proto'
-)
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -31,12 +20,13 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x13\x61\x64\x61pt
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'adapter_types_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
-  DESCRIPTOR._loaded_options = None
-  _globals['_ADAPTERCOMMONEVENTINFO_EXTRAENTRY']._loaded_options = None
-  _globals['_ADAPTERCOMMONEVENTINFO_EXTRAENTRY']._serialized_options = b'8\001'
-  _globals['_CACHEDUMPGRAPH_DUMPENTRY']._loaded_options = None
-  _globals['_CACHEDUMPGRAPH_DUMPENTRY']._serialized_options = b'8\001'
+if _descriptor._USE_C_DESCRIPTORS == False:
+
+  DESCRIPTOR._options = None
+  _ADAPTERCOMMONEVENTINFO_EXTRAENTRY._options = None
+  _ADAPTERCOMMONEVENTINFO_EXTRAENTRY._serialized_options = b'8\001'
+  _CACHEDUMPGRAPH_DUMPENTRY._options = None
+  _CACHEDUMPGRAPH_DUMPENTRY._serialized_options = b'8\001'
   _globals['_ADAPTERCOMMONEVENTINFO']._serialized_start=100
   _globals['_ADAPTERCOMMONEVENTINFO']._serialized_end=399
   _globals['_ADAPTERCOMMONEVENTINFO_EXTRAENTRY']._serialized_start=355

{dbt_adapters-1.10.3 → dbt_adapters-1.11.0}/dbt/include/global_project/macros/materializations/snapshots/helpers.sql

@@ -35,7 +35,7 @@
 {% endmacro %}
 
 {% macro get_snapshot_table_column_names() %}
-    {{ return({'dbt_valid_to': 'dbt_valid_to', 'dbt_valid_from': 'dbt_valid_from', 'dbt_scd_id': 'dbt_scd_id', 'dbt_updated_at': 'dbt_updated_at', 'dbt_is_deleted': 'dbt_is_deleted'}) }}
+    {{ return({'dbt_valid_to': 'dbt_valid_to', 'dbt_valid_from': 'dbt_valid_from', 'dbt_scd_id': 'dbt_scd_id', 'dbt_updated_at': 'dbt_updated_at'}) }}
 {% endmacro %}
 
 {% macro default__snapshot_staging_table(strategy, source_sql, target_relation) -%}
@@ -82,7 +82,7 @@
         from snapshot_query
     ),
 
-    {%- if strategy.hard_deletes == 'invalidate' or strategy.hard_deletes == 'new_record' %}
+    {%- if strategy.invalidate_hard_deletes %}
 
     deletes_source_data as (
 
@@ -96,9 +96,6 @@
         select
             'insert' as dbt_change_type,
             source_data.*
-          {%- if strategy.hard_deletes == 'new_record' -%}
-            ,'False' as {{ columns.dbt_is_deleted }}
-          {%- endif %}
 
         from insertions_source_data as source_data
         left outer join snapshotted_data
@@ -116,9 +113,6 @@
             'update' as dbt_change_type,
             source_data.*,
             snapshotted_data.{{ columns.dbt_scd_id }}
-          {%- if strategy.hard_deletes == 'new_record' -%}
-            , snapshotted_data.{{ columns.dbt_is_deleted }}
-          {%- endif %}
 
         from updates_source_data as source_data
         join snapshotted_data
@@ -128,8 +122,9 @@
         )
     )
 
-    {%- if strategy.hard_deletes == 'invalidate' or strategy.hard_deletes == 'new_record' %}
+    {%- if strategy.invalidate_hard_deletes -%}
     ,
+
     deletes as (
 
         select
@@ -139,38 +134,7 @@
             {{ snapshot_get_time() }} as {{ columns.dbt_updated_at }},
             {{ snapshot_get_time() }} as {{ columns.dbt_valid_to }},
             snapshotted_data.{{ columns.dbt_scd_id }}
-          {%- if strategy.hard_deletes == 'new_record' -%}
-            , snapshotted_data.{{ columns.dbt_is_deleted }}
-          {%- endif %}
-        from snapshotted_data
-        left join deletes_source_data as source_data
-            on {{ unique_key_join_on(strategy.unique_key, "snapshotted_data", "source_data") }}
-            where {{ unique_key_is_null(strategy.unique_key, "source_data") }}
-    )
-    {%- endif %}
-
-    {%- if strategy.hard_deletes == 'new_record' %}
-        {% set source_sql_cols = get_column_schema_from_query(source_sql) %}
-    ,
-    deletion_records as (
 
-        select
-            'insert' as dbt_change_type,
-            {%- for col in source_sql_cols -%}
-            snapshotted_data.{{ adapter.quote(col.column) }},
-            {% endfor -%}
-            {%- if strategy.unique_key | is_list -%}
-                {%- for key in strategy.unique_key -%}
-            snapshotted_data.{{ key }} as dbt_unique_key_{{ loop.index }},
-                {% endfor -%}
-            {%- else -%}
-            snapshotted_data.dbt_unique_key as dbt_unique_key,
-            {% endif -%}
-            {{ snapshot_get_time() }} as {{ columns.dbt_valid_from }},
-            {{ snapshot_get_time() }} as {{ columns.dbt_updated_at }},
-            snapshotted_data.{{ columns.dbt_valid_to }} as {{ columns.dbt_valid_to }},
-            snapshotted_data.{{ columns.dbt_scd_id }},
-            'True' as {{ columns.dbt_is_deleted }}
         from snapshotted_data
         left join deletes_source_data as source_data
             on {{ unique_key_join_on(strategy.unique_key, "snapshotted_data", "source_data") }}
@@ -181,15 +145,10 @@
     select * from insertions
     union all
     select * from updates
-    {%- if strategy.hard_deletes == 'invalidate' or strategy.hard_deletes == 'new_record' %}
+    {%- if strategy.invalidate_hard_deletes %}
     union all
     select * from deletes
     {%- endif %}
-    {%- if strategy.hard_deletes == 'new_record' %}
-    union all
-    select * from deletion_records
-    {%- endif %}
-
 
 {%- endmacro %}
 
@@ -206,9 +165,6 @@
         {{ strategy.updated_at }} as {{ columns.dbt_updated_at }},
         {{ strategy.updated_at }} as {{ columns.dbt_valid_from }},
         {{ get_dbt_valid_to_current(strategy, columns) }}
-      {%- if strategy.hard_deletes == 'new_record' -%}
-        , 'False' as {{ columns.dbt_is_deleted }}
-      {% endif -%}
     from (
         {{ sql }}
     ) sbq

{dbt_adapters-1.10.3 → dbt_adapters-1.11.0}/dbt/include/global_project/macros/materializations/snapshots/snapshot.sql

@@ -37,7 +37,7 @@
 
       {% set columns = config.get("snapshot_table_column_names") or get_snapshot_table_column_names() %}
 
-      {{ adapter.assert_valid_snapshot_target_given_strategy(target_relation, columns, strategy) }}
+      {{ adapter.valid_snapshot_target(target_relation, columns) }}
 
       {% set build_or_select_sql = snapshot_staging_table(strategy, sql, target_relation) %}
       {% set staging_table = build_snapshot_staging_table(strategy, sql, target_relation) %}

{dbt_adapters-1.10.3 → dbt_adapters-1.11.0}/dbt/include/global_project/macros/materializations/snapshots/strategies.sql

@@ -54,8 +54,7 @@
     {# The model_config parameter is no longer used, but is passed in anyway for compatibility. #}
     {% set primary_key = config.get('unique_key') %}
     {% set updated_at = config.get('updated_at') %}
-    {% set hard_deletes = adapter.get_hard_deletes_behavior(config) %}
-    {% set invalidate_hard_deletes = hard_deletes == 'invalidate' %}
+    {% set invalidate_hard_deletes = config.get('invalidate_hard_deletes') or false %}
     {% set columns = config.get("snapshot_table_column_names") or get_snapshot_table_column_names() %}
 
     {#/*
@@ -79,8 +78,7 @@
         "updated_at": updated_at,
         "row_changed": row_changed_expr,
         "scd_id": scd_id_expr,
-        "invalidate_hard_deletes": invalidate_hard_deletes,
-        "hard_deletes": hard_deletes
+        "invalidate_hard_deletes": invalidate_hard_deletes
     }) %}
 {% endmacro %}
 
@@ -143,8 +141,7 @@
     {# The model_config parameter is no longer used, but is passed in anyway for compatibility. #}
     {% set check_cols_config = config.get('check_cols') %}
     {% set primary_key = config.get('unique_key') %}
-    {% set hard_deletes = adapter.get_hard_deletes_behavior(config) %}
-    {% set invalidate_hard_deletes = hard_deletes == 'invalidate' %}
+    {% set invalidate_hard_deletes = config.get('invalidate_hard_deletes') or false %}
     {% set updated_at = config.get('updated_at') or snapshot_get_time() %}
 
     {% set column_added = false %}
@@ -178,7 +175,6 @@
         "updated_at": updated_at,
         "row_changed": row_changed_expr,
         "scd_id": scd_id_expr,
-        "invalidate_hard_deletes": invalidate_hard_deletes,
-        "hard_deletes": hard_deletes
+        "invalidate_hard_deletes": invalidate_hard_deletes
     }) %}
 {% endmacro %}

{dbt_adapters-1.10.3 → dbt_adapters-1.11.0}/pyproject.toml

@@ -23,12 +23,12 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-    "dbt-common>=1.13,<2.0",
+    "dbt-common>=1.11,<2.0",
     "pytz>=2015.7",
     # installed via dbt-common but used directly
     "agate>=1.0,<2.0",
-    "mashumaro[msgpack]>=3.9,<3.15",
-    "protobuf>=5.0,<6.0",
+    "mashumaro[msgpack]>=3.0,<4.0",
+    "protobuf>=3.0,<5.0",
     "typing-extensions>=4.0,<5.0",
 ]
 [project.urls]

dbt_adapters-1.10.3/dbt/adapters/__about__.py

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