dbt-adapters 1.17.2__py3-none-any.whl → 1.17.3__py3-none-any.whl

dbt/adapters/__about__.py

@@ -1 +1 @@
-version = "1.17.2"
+version = "1.17.3"

dbt/adapters/base/impl.py

@@ -31,6 +31,7 @@ from dbt.adapters.record.base import (
     AdapterConvertTypeRecord,
     AdapterStandardizeGrantsDictRecord,
     AdapterListRelationsWithoutCachingRecord,
+    AdapterGetColumnsInRelationRecord,
 )
 from dbt_common.behavior_flags import Behavior, BehaviorFlag
 from dbt_common.clients.jinja import CallableMacroGenerator
@@ -79,6 +80,7 @@ from dbt.adapters.catalogs import (
     CatalogIntegrationClient,
     CatalogIntegrationConfig,
     CatalogRelation,
+    CATALOG_INTEGRATION_MODEL_CONFIG_NAME,
 )
 from dbt.adapters.contracts.connection import Credentials
 from dbt.adapters.contracts.macros import MacroResolverProtocol
@@ -335,9 +337,18 @@ class BaseAdapter(metaclass=AdapterMeta):
         return self._catalog_client.get(name)
 
     @available
-    def build_catalog_relation(self, config: RelationConfig) -> CatalogRelation:
-        catalog = self.get_catalog_integration(config.catalog)
-        return catalog.build_relation(config)
+    def build_catalog_relation(self, config: RelationConfig) -> Optional[CatalogRelation]:
+        if not config.config:
+            return None
+
+        # "catalog" is legacy, but we support it for backward compatibility
+        if catalog_name := config.config.get(
+            CATALOG_INTEGRATION_MODEL_CONFIG_NAME
+        ) or config.config.get("catalog"):
+            catalog = self.get_catalog_integration(catalog_name)
+            return catalog.build_relation(config)
+
+        return None
 
     ###
     # Methods to set / access a macro resolver
@@ -735,7 +746,12 @@ class BaseAdapter(metaclass=AdapterMeta):
         """
         raise NotImplementedError("`rename_relation` is not implemented for this adapter!")
 
-    @auto_record_function("AdapterGetColumnsInRelation", group="Available")
+    @record_function(
+        AdapterGetColumnsInRelationRecord,
+        method=True,
+        index_on_thread_id=True,
+        id_field_name="thread_id",
+    )
     @abc.abstractmethod
     @available.parse_list
     def get_columns_in_relation(self, relation: BaseRelation) -> List[BaseColumn]:

dbt/adapters/contracts/relation.py

@@ -60,7 +60,6 @@ class RelationConfig(Protocol):
     tags: List[str]
     quoting_dict: Dict[str, bool]
     config: Optional[MaterializationConfig]
-    catalog: Optional[str]
 
 
 class ComponentName(StrEnum):

dbt/adapters/record/base.py

@@ -11,6 +11,7 @@ from dbt_common.record import Record, Recorder
 if TYPE_CHECKING:
     from agate import Table
     from dbt.adapters.base.relation import BaseRelation
+    from dbt.adapters.base.column import Column as BaseColumn
 
 
 @dataclasses.dataclass
@@ -244,3 +245,47 @@ class AdapterListRelationsWithoutCachingRecord(Record):
     params_cls = AdapterListRelationsWithoutCachingParams
     result_cls = AdapterListRelationsWithoutCachingResult
     group = "Available"
+
+
+@dataclasses.dataclass
+class AdapterGetColumnsInRelationParams:
+    thread_id: str
+    relation: "BaseRelation"
+
+    def _to_dict(self):
+        from dbt.adapters.record.serialization import serialize_base_relation
+
+        return {
+            "thread_id": self.thread_id,
+            "relation": serialize_base_relation(self.relation),
+        }
+
+    def _from_dict(self, data: Dict[str, Any]):
+        from dbt.adapters.record.serialization import deserialize_base_relation
+
+        self.thread_id = data["thread_id"]
+        self.relation = deserialize_base_relation(data["relation"])
+
+
+@dataclasses.dataclass
+class AdapterGetColumnsInRelationResult:
+    return_val: List["BaseColumn"]
+
+    def _to_dict(self):
+        from dbt.adapters.record.serialization import serialize_base_column_list
+
+        return {"return_val": serialize_base_column_list(self.return_val)}
+
+    def _from_dict(self, data: Dict[str, Any]):
+        from dbt.adapters.record.serialization import deserialize_base_column_list
+
+        self.return_val = deserialize_base_column_list(data["return_val"])
+
+
+@Recorder.register_record_type
+class AdapterGetColumnsInRelationRecord(Record):
+    """Implements record/replay support for the BaseAdapter.get_columns_in_relation() method."""
+
+    params_cls = AdapterGetColumnsInRelationParams
+    result_cls = AdapterGetColumnsInRelationResult
+    group = "Available"

dbt/adapters/record/serialization.py

@@ -1,3 +1,4 @@
+import dataclasses
 from datetime import datetime, date
 from decimal import Decimal
 from typing import Any, Dict, TYPE_CHECKING, List, Union
@@ -5,6 +6,7 @@ from typing import Any, Dict, TYPE_CHECKING, List, Union
 if TYPE_CHECKING:
     from agate import Table
     from dbt.adapters.base.relation import BaseRelation
+    from dbt.adapters.base.column import Column as BaseColumn
 
 
 def _column_filter(val: Any) -> Any:
@@ -61,3 +63,27 @@ def deserialize_base_relation(relation_dict: Dict[str, Any]) -> "BaseRelation":
 def deserialize_base_relation_list(relations_data: List[Dict[str, Any]]) -> List["BaseRelation"]:
     """Deserialize a list of BaseRelation objects from dictionaries."""
     return [deserialize_base_relation(relation_dict) for relation_dict in relations_data]
+
+
+def serialize_base_column_list(columns: List["BaseColumn"]) -> List[Dict[str, Any]]:
+    return [serialize_base_column(column) for column in columns]
+
+
+def serialize_base_column(column: "BaseColumn") -> Dict[str, Any]:
+    column_dict = dataclasses.asdict(column)
+    return column_dict
+
+
+def deserialize_base_column_list(columns_data: List[Dict[str, Any]]) -> List["BaseColumn"]:
+    return [deserialize_base_column(column_dict) for column_dict in columns_data]
+
+
+def deserialize_base_column(column_dict: Dict[str, Any]) -> "BaseColumn":
+    # Only include fields that are present in the base column class
+    params_dict = {
+        field.name: column_dict[field.name]
+        for field in dataclasses.fields(BaseColumn)
+        if field.name in column_dict
+    }
+
+    return BaseColumn(**params_dict)

{dbt_adapters-1.17.2.dist-info → dbt_adapters-1.17.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbt-adapters
-Version: 1.17.2
+Version: 1.17.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.17.2.dist-info → dbt_adapters-1.17.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-dbt/adapters/__about__.py,sha256=wxC9D2Pc7hCgPR77PzCTk0oUVNpCt0m9Qi2eoi3zzbk,19
+dbt/adapters/__about__.py,sha256=qVDR3TR6VtE0YfURW1Jg-x24e0XH8kwGXDwnwHu0L-I,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=uACwbMYJL9KykHdckf-9Egz4MBGecwOsSrYtU72OEx8,79181
+dbt/adapters/base/impl.py,sha256=IpqLpwlSu2sF6JCRXS7JyRa4sRdfcirPl-krHeKu9RM,79654
 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
@@ -26,7 +26,7 @@ dbt/adapters/clients/jinja.py,sha256=NsZOiBpOLunS46hRL5OcX1MpY3Ih6_87Vgz4qd_PNbc
 dbt/adapters/contracts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbt/adapters/contracts/connection.py,sha256=azipef6NBjkh88OcuF90cNUdcYBPXFMl9K99OAwdl_0,6926
 dbt/adapters/contracts/macros.py,sha256=NYVDi5ww7v4ksKBwF836TXE-2xU4IBaUINqvxMY-ieU,366
-dbt/adapters/contracts/relation.py,sha256=JEt9uTHUelb1aZ0PeUbIASoLL2GrG1Q1Ibr_7oGhigM,4819
+dbt/adapters/contracts/relation.py,sha256=ZO1nq1KmImQT6kO0mhxJcZAFXzP4Z6yZAqYGY3h6S1U,4792
 dbt/adapters/events/README.md,sha256=3rMVP1XO1Lw7Dv6g7-SkDsAcN4VVjIF0fHKopEcCzXk,2689
 dbt/adapters/events/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbt/adapters/events/adapter_types_pb2.py,sha256=Mov1yYR_v9JG6n7MHvzEbFtLN4gMQ1Uv5die8u2eJag,126
@@ -40,9 +40,9 @@ dbt/adapters/exceptions/compilation.py,sha256=ylUvVLwlzeKqFr16pGhSqHBbE3Z-lneDpp
 dbt/adapters/exceptions/connection.py,sha256=x82j2Ix242Slm6Ima8Tol3GLOB9yZYH5lq6IV1WKq54,445
 dbt/adapters/exceptions/database.py,sha256=nIXJdQyPQOZaiKvCkQ3MoKlKOiaN58rtDZflw3CSkug,1618
 dbt/adapters/record/__init__.py,sha256=u_0eJzN5RL90oL-RNoP2wWGMCGp0kG0lZ0uVWnnGdxs,123
-dbt/adapters/record/base.py,sha256=4HAGpxUX-9JoWgrWctM29xX_EBfVUD-FbLGukQH33kM,6714
+dbt/adapters/record/base.py,sha256=5e-y18NK9K1H8L94OZrkTxE0_Wsytp83_t62rEJ7RG0,8164
 dbt/adapters/record/handle.py,sha256=hCQpDmZGKqJXrSqgYcb-F542TZi069uz1MY9fS15INo,1907
-dbt/adapters/record/serialization.py,sha256=aysH908v3qURycAPZ4a-TwDa5UQZrcmaeu1Zj_RFTvE,1987
+dbt/adapters/record/serialization.py,sha256=8ASdf-3hk1AnOSC_xYVgxCrlPE6WNbqEgxBFdskeMpQ,2874
 dbt/adapters/record/cursor/cursor.py,sha256=AW0B1g0j5mn7pUnvsE7zd4_Zi7cSFOsyvPbE2HV0CPI,2967
 dbt/adapters/record/cursor/description.py,sha256=5LNebP2AF2aicPWfM9FsD5r7SAmdac8TX_4NZfJQgPk,1060
 dbt/adapters/record/cursor/execute.py,sha256=f8Yc1MKExj7QLbFnK8WnnwsoGESuYMWnFWhytbcAPjc,1271
@@ -166,7 +166,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.17.2.dist-info/METADATA,sha256=g1DhELVUkxSbyMtvQRpcpw70Nuoz0KcW4SslEsNuCOo,4534
-dbt_adapters-1.17.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dbt_adapters-1.17.2.dist-info/licenses/LICENSE,sha256=9yjigiJhWcCZvQjdagGKDwrRph58QWc5P2bVSQwXo6s,11344
-dbt_adapters-1.17.2.dist-info/RECORD,,
+dbt_adapters-1.17.3.dist-info/METADATA,sha256=0qS2nabX3aCNSPAr7N1ogI7CXpr6YU_tlZdXd_pQo3I,4534
+dbt_adapters-1.17.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dbt_adapters-1.17.3.dist-info/licenses/LICENSE,sha256=9yjigiJhWcCZvQjdagGKDwrRph58QWc5P2bVSQwXo6s,11344
+dbt_adapters-1.17.3.dist-info/RECORD,,