dbt-adapters 1.14.4__tar.gz → 1.14.6__tar.gz

{dbt_adapters-1.14.4 → dbt_adapters-1.14.6}/.changes/1.14.4.md

@@ -7,5 +7,3 @@
 ### Fixes
 
 - Fix the python model empty/sample mode fix to not break when the ref macro has been overridden ([#953](https://github.com/dbt-labs/dbt-adapters/issues/953))
-
-

dbt_adapters-1.14.6/.changes/1.14.5.md

@@ -0,0 +1,9 @@
+## dbt-adapters 1.14.5 - April 07, 2025
+
+### Fixes
+
+- Create indexes on the intermediate relation before the swap ([#966](https://github.com/dbt-labs/dbt-adapters/issues/966))
+- Create indexes on the intermediate relation before the swap for incremental models ([#966](https://github.com/dbt-labs/dbt-adapters/issues/966))
+
+### Contributors
+- [@etx121](https://github.com/etx121) ([#966](https://github.com/dbt-labs/dbt-adapters/issues/966), [#966](https://github.com/dbt-labs/dbt-adapters/issues/966))

dbt_adapters-1.14.6/.changes/1.14.6.md

@@ -0,0 +1,5 @@
+## dbt-adapters 1.14.6 - April 14, 2025
+
+### Under the Hood
+
+- Add more robust operation forwarding to record/replay wrappers. ([#990](https://github.com/dbt-labs/dbt-adapters/issues/990))

{dbt_adapters-1.14.4 → dbt_adapters-1.14.6}/CHANGELOG.md

@@ -10,6 +10,24 @@ 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.6 - April 14, 2025
+
+### Under the Hood
+
+- Add more robust operation forwarding to record/replay wrappers. ([#990](https://github.com/dbt-labs/dbt-adapters/issues/990))
+
+
+
+## dbt-adapters 1.14.5 - April 07, 2025
+
+### Fixes
+
+- Create indexes on the intermediate relation before the swap ([#966](https://github.com/dbt-labs/dbt-adapters/issues/966))
+- Create indexes on the intermediate relation before the swap for incremental models ([#966](https://github.com/dbt-labs/dbt-adapters/issues/966))
+
+### Contributors
+- [@etx121](https://github.com/etx121) ([#966](https://github.com/dbt-labs/dbt-adapters/issues/966), [#966](https://github.com/dbt-labs/dbt-adapters/issues/966))
+
 ## dbt-adapters 1.14.4 - March 31, 2025
 
 ### Features
@@ -20,8 +38,6 @@ and is generated by [Changie](https://github.com/miniscruff/changie)
 
 - Fix the python model empty/sample mode fix to not break when the ref macro has been overridden ([#953](https://github.com/dbt-labs/dbt-adapters/issues/953))
 
-
-
 ## dbt-adapters 1.14.3 - March 19, 2025
 
 ### Features

{dbt_adapters-1.14.4 → dbt_adapters-1.14.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbt-adapters
-Version: 1.14.4
+Version: 1.14.6
 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.14.6/src/dbt/adapters/__about__.py

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

{dbt_adapters-1.14.4 → dbt_adapters-1.14.6}/src/dbt/adapters/record/cursor/cursor.py

@@ -1,5 +1,8 @@
 from typing import Any, Optional
 
+from dbt_common.events.base_types import BaseEvent
+from dbt_common.events.functions import fire_event
+from dbt_common.events.types import RecordReplayIssue
 from dbt_common.record import record_function
 
 from dbt.adapters.contracts.connection import Connection
@@ -52,3 +55,15 @@ class RecordReplayCursor:
     @record_function(CursorGetDescriptionRecord, method=True, id_field_name="connection_name")
     def description(self) -> str:
         return self.native_cursor.description
+
+    def _fire_event(self, evt: BaseEvent) -> None:
+        """Wraps fire_event for easier test mocking."""
+        fire_event(evt)
+
+    def __getattr__(self, name: str) -> Any:
+        self._fire_event(
+            RecordReplayIssue(
+                msg=f"Unexpected attribute '{name}' accessed on {self.__class__.__name__}"
+            )
+        )
+        return getattr(self.native_cursor, name)

{dbt_adapters-1.14.4 → dbt_adapters-1.14.6}/src/dbt/adapters/record/handle.py

@@ -1,7 +1,10 @@
 from typing import Any
 
-from dbt.adapters.contracts.connection import Connection
+from dbt_common.events.base_types import BaseEvent
+from dbt_common.events.functions import fire_event
+from dbt_common.events.types import RecordReplayIssue
 
+from dbt.adapters.contracts.connection import Connection
 from dbt.adapters.record.cursor.cursor import RecordReplayCursor
 
 
@@ -38,3 +41,15 @@ class RecordReplayHandle:
     @property
     def closed(self):
         return self.native_handle.closed
+
+    def _fire_event(self, evt: BaseEvent) -> None:
+        """Wraps fire_event for easier test mocking."""
+        fire_event(evt)
+
+    def __getattr__(self, name: str) -> Any:
+        self._fire_event(
+            RecordReplayIssue(
+                msg=f"Unexpected attribute '{name}' accessed on {self.__class__.__name__}"
+            )
+        )
+        return getattr(self.native_handle, name)

{dbt_adapters-1.14.4 → dbt_adapters-1.14.6}/src/dbt/include/global_project/macros/materializations/models/incremental/incremental.sql

@@ -37,11 +37,14 @@
 
   {% if existing_relation is none %}
       {% set build_sql = get_create_table_as_sql(False, target_relation, sql) %}
+      {% set relation_for_indexes = target_relation %}
   {% elif full_refresh_mode %}
       {% set build_sql = get_create_table_as_sql(False, intermediate_relation, sql) %}
+      {% set relation_for_indexes = intermediate_relation %}
       {% set need_swap = true %}
   {% else %}
     {% do run_query(get_create_table_as_sql(True, temp_relation, sql)) %}
+    {% set relation_for_indexes = temp_relation %}
     {% set contract_config = config.get('contract') %}
     {% if not contract_config or not contract_config.enforced %}
       {% do adapter.expand_target_column_types(
@@ -65,6 +68,10 @@
       {{ build_sql }}
   {% endcall %}
 
+  {% if existing_relation is none or existing_relation.is_view or should_full_refresh() %}
+    {% do create_indexes(relation_for_indexes) %}
+  {% endif %}
+
   {% if need_swap %}
       {% do adapter.rename_relation(target_relation, backup_relation) %}
       {% do adapter.rename_relation(intermediate_relation, target_relation) %}
@@ -76,10 +83,6 @@
 
   {% do persist_docs(target_relation, model) %}
 
-  {% if existing_relation is none or existing_relation.is_view or should_full_refresh() %}
-    {% do create_indexes(target_relation) %}
-  {% endif %}
-
   {{ run_hooks(post_hooks, inside_transaction=True) }}
 
   -- `COMMIT` happens here

{dbt_adapters-1.14.4 → dbt_adapters-1.14.6}/src/dbt/include/global_project/macros/materializations/models/table.sql

@@ -31,6 +31,8 @@
     {{ get_create_table_as_sql(False, intermediate_relation, sql) }}
   {%- endcall %}
 
+  {% do create_indexes(intermediate_relation) %}
+
   -- cleanup
   {% if existing_relation is not none %}
      /* Do the equivalent of rename_if_exists. 'existing_relation' could have been dropped
@@ -43,8 +45,6 @@
 
   {{ adapter.rename_relation(intermediate_relation, target_relation) }}
 
-  {% do create_indexes(target_relation) %}
-
   {{ run_hooks(post_hooks, inside_transaction=True) }}
 
   {% set should_revoke = should_revoke(existing_relation, full_refresh_mode=True) %}

dbt_adapters-1.14.6/tests/unit/record/test_record_cursor.py

@@ -0,0 +1,50 @@
+from dbt.adapters.record import RecordReplayCursor
+
+
+class MockCursor:
+    @property
+    def rowcount(self) -> int:
+        return 42
+
+    def execute(self, operation, parameters=None) -> None:
+        pass
+
+    @property
+    def unexpected_prop(self) -> bool:
+        return True
+
+    def unexpected_func(self) -> int:
+        return 1
+
+
+class MockConnection:
+    pass
+
+
+def test_record_cursor():
+    # Ensure that record/replay's cursor wrapper forwards all property accesses
+    # and function calls to the wrapped cursor, even if they were not expected.
+    # Also, verify that a RecordReplayIssue is logged if unexpected accesses or
+    # function calls happen.
+    recorded_cursor = RecordReplayCursor(MockCursor(), MockConnection())  # type: ignore
+
+    # Test that an expected property works as designed
+    assert recorded_cursor.rowcount == 42
+    # Test that an expected function call works as designed
+    recorded_cursor.execute("select 1")
+
+    events = []
+
+    # Mock event firing
+    recorded_cursor._fire_event = events.append
+
+    # Test that an unexpected property works, but fires a warning
+    assert recorded_cursor.unexpected_prop is True
+    assert len(events) == 1
+    assert events[0].__class__.__name__ == "RecordReplayIssue"
+    events.clear()
+
+    # Test that an unexpected function works, but fires a warning
+    assert recorded_cursor.unexpected_func() == 1
+    assert len(events) == 1
+    assert events[0].__class__.__name__ == "RecordReplayIssue"

dbt_adapters-1.14.6/tests/unit/record/test_record_handle.py

@@ -0,0 +1,50 @@
+from dbt.adapters.record import RecordReplayHandle
+
+
+class MockConnection:
+    pass
+
+
+class MockHandle:
+    @property
+    def closed(self) -> bool:
+        return False
+
+    def rollback(self) -> None:
+        pass
+
+    @property
+    def unexpected_prop(self) -> bool:
+        return True
+
+    def unexpected_func(self) -> int:
+        return 1
+
+
+def test_record_handle():
+    # Ensure that record/replay's handle wrapper forwards all property accesses
+    # and function calls to the wrapped cursor, even if they were not expected.
+    # Also, verify that a RecordReplayIssue is logged if unexpected accesses or
+    # function calls happen.
+    recorded_handle = RecordReplayHandle(MockHandle(), MockConnection())  # type: ignore
+
+    # Test that an expected property works as designed
+    assert recorded_handle.closed is False
+    # Test that an expected function call works as designed
+    recorded_handle.rollback()
+
+    events = []
+
+    # Mock event firing
+    recorded_handle._fire_event = events.append
+
+    # Test that an unexpected property works, but fires a warning
+    assert recorded_handle.unexpected_prop is True
+    assert len(events) == 1
+    assert events[0].__class__.__name__ == "RecordReplayIssue"
+    events.clear()
+
+    # Test that an unexpected function works, but fires a warning
+    assert recorded_handle.unexpected_func() == 1
+    assert len(events) == 1
+    assert events[0].__class__.__name__ == "RecordReplayIssue"

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

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