dbt-adapters 1.1.0__tar.gz → 1.1.0rc1__tar.gz

{dbt_adapters-1.1.0 → dbt_adapters-1.1.0rc1}/.gitignore

@@ -153,4 +153,4 @@ dmypy.json
 cython_debug/
 
 # PyCharm
-.idea/
+.idea/

{dbt_adapters-1.1.0 → dbt_adapters-1.1.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dbt-adapters
-Version: 1.1.0
+Version: 1.1.0rc1
 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
@@ -20,7 +20,6 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8.0
 Requires-Dist: agate<2.0,>=1.0
 Requires-Dist: dbt-common<2.0

dbt_adapters-1.1.0rc1/dbt/adapters/__about__.py

@@ -0,0 +1 @@
+version = "1.1.0rc1"

{dbt_adapters-1.1.0 → dbt_adapters-1.1.0rc1}/dbt/adapters/__init__.py

@@ -2,7 +2,6 @@
 This adds all subdirectories of directories on `sys.path` to this package’s `__path__` .
 It effectively combines all adapters into a single namespace (dbt.adapter).
 """
-
 from pkgutil import extend_path
 
 __path__ = extend_path(__path__, __name__)

{dbt_adapters-1.1.0 → dbt_adapters-1.1.0rc1}/dbt/adapters/base/connections.py

@@ -165,9 +165,7 @@ class BaseConnectionManager(metaclass=abc.ABCMeta):
             conn.handle = LazyHandle(self.open)
             # Add the connection to thread_connections for this thread
             self.set_thread_connection(conn)
-            fire_event(
-                NewConnection(conn_name=conn_name, conn_type=self.TYPE, node_info=get_node_info())
-            )
+            fire_event(NewConnection(conn_name=conn_name, conn_type=self.TYPE, node_info=get_node_info()))
         else:  # existing connection either wasn't open or didn't have the right name
             if conn.state != "open":
                 conn.handle = LazyHandle(self.open)

{dbt_adapters-1.1.0 → dbt_adapters-1.1.0rc1}/dbt/adapters/base/impl.py

@@ -1328,16 +1328,14 @@ class BaseAdapter(metaclass=AdapterMeta):
         # Track schema, identifiers of sources for lookup from batch query
         schema_identifier_to_source = {
             (
-                source.path.get_lowered_part(ComponentName.Schema),  # type: ignore
-                source.path.get_lowered_part(ComponentName.Identifier),  # type: ignore
+                source.path.get_lowered_part(ComponentName.Schema),
+                source.path.get_lowered_part(ComponentName.Identifier),
             ): source
             for source in sources
         }
 
         # Group metadata sources by information schema -- one query per information schema will be necessary
-        sources_by_info_schema: Dict[InformationSchema, List[BaseRelation]] = (
-            self._get_catalog_relations_by_info_schema(sources)
-        )
+        sources_by_info_schema: Dict[InformationSchema, List[BaseRelation]] = self._get_catalog_relations_by_info_schema(sources)
 
         freshness_responses: Dict[BaseRelation, FreshnessResponse] = {}
         adapter_responses: List[Optional[AdapterResponse]] = []
@@ -1395,9 +1393,7 @@ class BaseAdapter(metaclass=AdapterMeta):
 
         return freshness
 
-    def _parse_freshness_row(
-        self, row: "agate.Row", table: "agate.Table"
-    ) -> Tuple[Any, FreshnessResponse]:
+    def _parse_freshness_row(self, row: "agate.Row", table: "agate.Table") -> Tuple[Any, FreshnessResponse]:
         from dbt_common.clients.agate_helper import get_column_value_uncased
 
         try:
@@ -1408,7 +1404,10 @@ class BaseAdapter(metaclass=AdapterMeta):
         except Exception:
             raise MacroResultError(GET_RELATION_LAST_MODIFIED_MACRO_NAME, table)
 
-        freshness_response = self._create_freshness_response(last_modified_val, snapshotted_at_val)
+        freshness_response = self._create_freshness_response(
+            last_modified_val,
+            snapshotted_at_val
+        )
         raw_relation = schema.lower().strip(), identifier.lower().strip()
         return raw_relation, freshness_response
 

{dbt_adapters-1.1.0 → dbt_adapters-1.1.0rc1}/dbt/adapters/base/relation.py

@@ -47,9 +47,6 @@ class BaseRelation(FakeAPIObject, Hashable):
     quote_policy: Policy = field(default_factory=lambda: Policy())
     dbt_created: bool = False
     limit: Optional[int] = None
-    require_alias: bool = (
-        True  # used to govern whether to add an alias when render_limited is called
-    )
 
     # register relation types that can be renamed for the purpose of replacing relations using stages and backups
     # adding a relation type here also requires defining the associated rename macro
@@ -208,22 +205,14 @@ class BaseRelation(FakeAPIObject, Hashable):
         # if there is nothing set, this will return the empty string.
         return ".".join(part for _, part in self._render_iterator() if part is not None)
 
-    def _render_limited_alias(self) -> str:
-        """Some databases require an alias for subqueries (postgres, mysql) for all others we want to avoid adding
-        an alias as it has the potential to introduce issues with the query if the user also defines an alias.
-        """
-        if self.require_alias:
-            return f" _dbt_limit_subq_{self.table}"
-        return ""
-
     def render_limited(self) -> str:
         rendered = self.render()
         if self.limit is None:
             return rendered
         elif self.limit == 0:
-            return f"(select * from {rendered} where false limit 0){self._render_limited_alias()}"
+            return f"(select * from {rendered} where false limit 0) _dbt_limit_subq"
         else:
-            return f"(select * from {rendered} limit {self.limit}){self._render_limited_alias()}"
+            return f"(select * from {rendered} limit {self.limit}) _dbt_limit_subq"
 
     def quoted(self, identifier):
         return "{quote_char}{identifier}{quote_char}".format(

{dbt_adapters-1.1.0 → dbt_adapters-1.1.0rc1}/dbt/adapters/contracts/relation.py

@@ -40,9 +40,11 @@ class MaterializationConfig(Mapping, ABC):
     contract: MaterializationContract
     extra: Dict[str, Any]
 
-    def __contains__(self, item): ...
+    def __contains__(self, item):
+        ...
 
-    def __delitem__(self, key): ...
+    def __delitem__(self, key):
+        ...
 
 
 class RelationConfig(Protocol):

{dbt_adapters-1.1.0 → dbt_adapters-1.1.0rc1}/dbt/adapters/events/README.md

@@ -14,7 +14,7 @@ When events are processed via `fire_event`, nearly everything is logged. Whether
 
 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.
+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. 
 
 ## Required for Every Event
 

{dbt_adapters-1.1.0 → dbt_adapters-1.1.0rc1}/dbt/adapters/factory.py

@@ -101,14 +101,17 @@ class AdapterContainer:
         self,
         config: AdapterRequiredConfig,
         mp_context: SpawnContext,
-        adapter_registered_log_level: Optional[EventLevel] = EventLevel.INFO,
+        adapter_registered_log_level: Optional[EventLevel] = EventLevel.INFO
     ) -> None:
         adapter_name = config.credentials.type
         adapter_type = self.get_adapter_class_by_name(adapter_name)
         adapter_version = self._adapter_version(adapter_name)
         fire_event(
-            AdapterRegistered(adapter_name=adapter_name, adapter_version=adapter_version),
-            level=adapter_registered_log_level,
+            AdapterRegistered(
+                adapter_name=adapter_name,
+                adapter_version=adapter_version
+            ),
+            level=adapter_registered_log_level
         )
         with self.lock:
             if adapter_name in self.adapters:
@@ -196,9 +199,9 @@ FACTORY: AdapterContainer = AdapterContainer()
 
 
 def register_adapter(
-    config: AdapterRequiredConfig,
-    mp_context: SpawnContext,
-    adapter_registered_log_level: Optional[EventLevel] = EventLevel.INFO,
+        config: AdapterRequiredConfig,
+        mp_context: SpawnContext,
+        adapter_registered_log_level: Optional[EventLevel] = EventLevel.INFO
 ) -> None:
     FACTORY.register_adapter(config, mp_context, adapter_registered_log_level)
 

{dbt_adapters-1.1.0 → dbt_adapters-1.1.0rc1}/dbt/adapters/protocol.py

@@ -47,7 +47,8 @@ Self = TypeVar("Self", bound="RelationProtocol")
 
 class RelationProtocol(Protocol):
     @classmethod
-    def get_default_quote_policy(cls) -> Policy: ...
+    def get_default_quote_policy(cls) -> Policy:
+        ...
 
     @classmethod
     def create_from(
@@ -55,7 +56,8 @@ class RelationProtocol(Protocol):
         quoting: HasQuoting,
         relation_config: RelationConfig,
         **kwargs: Any,
-    ) -> Self: ...
+    ) -> Self:
+        ...
 
 
 AdapterConfig_T = TypeVar("AdapterConfig_T", bound=AdapterConfig)
@@ -71,7 +73,8 @@ class MacroContextGeneratorCallable(Protocol):
         config: AdapterRequiredConfig,
         macro_resolver: MacroResolverProtocol,
         package_name: Optional[str],
-    ) -> Dict[str, Any]: ...
+    ) -> Dict[str, Any]:
+        ...
 
 
 # TODO CT-211
@@ -93,58 +96,81 @@ class AdapterProtocol(  # type: ignore[misc]
     ConnectionManager: Type[ConnectionManager_T]
     connections: ConnectionManager_T
 
-    def __init__(self, config: AdapterRequiredConfig) -> None: ...
+    def __init__(self, config: AdapterRequiredConfig) -> None:
+        ...
 
-    def set_macro_resolver(self, macro_resolver: MacroResolverProtocol) -> None: ...
+    def set_macro_resolver(self, macro_resolver: MacroResolverProtocol) -> None:
+        ...
 
-    def get_macro_resolver(self) -> Optional[MacroResolverProtocol]: ...
+    def get_macro_resolver(self) -> Optional[MacroResolverProtocol]:
+        ...
 
-    def clear_macro_resolver(self) -> None: ...
+    def clear_macro_resolver(self) -> None:
+        ...
 
     def set_macro_context_generator(
         self,
         macro_context_generator: MacroContextGeneratorCallable,
-    ) -> None: ...
+    ) -> None:
+        ...
 
     @classmethod
     def type(cls) -> str:
         pass
 
-    def set_query_header(self, query_header_context: Dict[str, Any]) -> None: ...
+    def set_query_header(self, query_header_context: Dict[str, Any]) -> None:
+        ...
 
     @staticmethod
-    def get_thread_identifier() -> Hashable: ...
+    def get_thread_identifier() -> Hashable:
+        ...
 
-    def get_thread_connection(self) -> Connection: ...
+    def get_thread_connection(self) -> Connection:
+        ...
 
-    def set_thread_connection(self, conn: Connection) -> None: ...
+    def set_thread_connection(self, conn: Connection) -> None:
+        ...
 
-    def get_if_exists(self) -> Optional[Connection]: ...
+    def get_if_exists(self) -> Optional[Connection]:
+        ...
 
-    def clear_thread_connection(self) -> None: ...
+    def clear_thread_connection(self) -> None:
+        ...
 
-    def clear_transaction(self) -> None: ...
+    def clear_transaction(self) -> None:
+        ...
 
-    def exception_handler(self, sql: str) -> ContextManager: ...
+    def exception_handler(self, sql: str) -> ContextManager:
+        ...
 
-    def set_connection_name(self, name: Optional[str] = None) -> Connection: ...
+    def set_connection_name(self, name: Optional[str] = None) -> Connection:
+        ...
 
-    def cancel_open(self) -> Optional[List[str]]: ...
+    def cancel_open(self) -> Optional[List[str]]:
+        ...
 
-    def open(cls, connection: Connection) -> Connection: ...
+    def open(cls, connection: Connection) -> Connection:
+        ...
 
-    def release(self) -> None: ...
+    def release(self) -> None:
+        ...
 
-    def cleanup_all(self) -> None: ...
+    def cleanup_all(self) -> None:
+        ...
 
-    def begin(self) -> None: ...
+    def begin(self) -> None:
+        ...
 
-    def commit(self) -> None: ...
+    def commit(self) -> None:
+        ...
 
-    def close(cls, connection: Connection) -> Connection: ...
+    def close(cls, connection: Connection) -> Connection:
+        ...
 
-    def commit_if_has_connection(self) -> None: ...
+    def commit_if_has_connection(self) -> None:
+        ...
 
     def execute(
         self, sql: str, auto_begin: bool = False, fetch: bool = False
-    ) -> Tuple[AdapterResponse, "agate.Table"]: ...
+    ) -> Tuple[AdapterResponse, "agate.Table"]:
+        ...

{dbt_adapters-1.1.0 → dbt_adapters-1.1.0rc1}/dbt/adapters/relation_configs/README.md

@@ -1,6 +1,6 @@
 # RelationConfig
 This package serves as an initial abstraction for managing the inspection of existing relations and determining
-changes on those relations. It arose from the materialized view work and is currently only supporting
+changes on those relations. It arose from the materialized view work and is currently only supporting 
 materialized views for Postgres and Redshift as well as dynamic tables for Snowflake. There are three main
 classes in this package.
 

{dbt_adapters-1.1.0 → dbt_adapters-1.1.0rc1}/dbt/adapters/relation_configs/config_change.py

@@ -16,9 +16,7 @@ class RelationConfigChangeAction(StrEnum):
 @dataclass(frozen=True, eq=True, unsafe_hash=True)
 class RelationConfigChange(RelationConfigBase, ABC):
     action: RelationConfigChangeAction
-    context: (
-        Hashable  # this is usually a RelationConfig, e.g. IndexConfig, but shouldn't be limited
-    )
+    context: Hashable  # this is usually a RelationConfig, e.g. IndexConfig, but shouldn't be limited
 
     @property
     @abstractmethod

{dbt_adapters-1.1.0 → dbt_adapters-1.1.0rc1}/dbt/include/global_project/macros/adapters/columns.sql

@@ -53,7 +53,7 @@
         {%- do col_naked_numeric.append(col['name']) -%}
       {%- endif -%}
       {% set col_name = adapter.quote(col['name']) if col.get('quote') else col['name'] %}
-      {{ cast('null', col['data_type']) }} as {{ col_name }}{{ ", " if not loop.last }}
+      cast(null as {{ col['data_type'] }}) as {{ col_name }}{{ ", " if not loop.last }}
     {%- endfor -%}
     {%- if (col_err | length) > 0 -%}
       {{ exceptions.column_type_missing(column_names=col_err) }}

{dbt_adapters-1.1.0 → dbt_adapters-1.1.0rc1}/dbt/include/global_project/macros/materializations/tests/helpers.sql

@@ -41,4 +41,4 @@ dbt_internal_unit_test_expected as (
 select * from dbt_internal_unit_test_actual
 union all
 select * from dbt_internal_unit_test_expected
-{%- endmacro %}
+{%- endmacro %}

{dbt_adapters-1.1.0 → dbt_adapters-1.1.0rc1}/dbt/include/global_project/macros/unit_test_sql/get_fixture_sql.sql

@@ -79,7 +79,7 @@ union all
         {%- endif -%}
 
         {%- set column_type = column_name_to_data_types[column_name] %}
-
+        
         {#-- sanitize column_value: wrap yaml strings in quotes, apply cast --#}
         {%- set column_value_clean = column_value -%}
         {%- if column_value is string -%}

{dbt_adapters-1.1.0 → dbt_adapters-1.1.0rc1}/pyproject.toml

@@ -21,7 +21,6 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
     "dbt-common<2.0",
@@ -55,16 +54,35 @@ include = ["dbt/adapters", "dbt/include", "dbt/__init__.py"]
 [tool.hatch.envs.default]
 dependencies = [
     "dbt_common @ git+https://github.com/dbt-labs/dbt-common.git",
-    'pre-commit==3.7.0;python_version>="3.9"',
-    'pre-commit==3.5.0;python_version=="3.8"',
 ]
-[tool.hatch.envs.default.scripts]
-dev = "pre-commit install"
-code-quality = "pre-commit run --all-files"
+
+[tool.hatch.envs.lint]
+detached = true
+dependencies = [
+    "black>=24.3",
+    "flake8",
+    "Flake8-pyproject",
+]
+[tool.hatch.envs.lint.scripts]
+all = [
+    "- black-only",
+    "- flake8-only",
+]
+black-only = "python -m black ."
+flake8-only = "python -m flake8 ."
+
+[tool.hatch.envs.typecheck]
+dependencies = [
+    "mypy",
+    "types-PyYAML",
+    "types-protobuf",
+    "types-pytz",
+]
+[tool.hatch.envs.typecheck.scripts]
+all = "python -m mypy ."
 
 [tool.hatch.envs.unit-tests]
 dependencies = [
-    "dbt_common @ git+https://github.com/dbt-labs/dbt-common.git",
     "pytest",
     "pytest-dotenv",
     "pytest-xdist",
@@ -96,8 +114,37 @@ check-sdist = [
 ]
 protobuf = "protoc -I=./dbt/adapters/events --python_out=./dbt/adapters/events ./dbt/adapters/events/adapter_types.proto"
 
+[tool.black]
+extend-exclude = "dbt/adapters/events/adapter_types_pb2.py"
+line-length = 99
+target-version = ['py38']
+
+[tool.flake8]
+select = ["E", "W", "F"]
+ignore = ["E203", "E501", "E741", "W503", "W504"]
+exclude = [
+    "dbt/adapters/events/adapter_types_pb2.py",
+    "tests/functional",
+    "venv",
+]
+per-file-ignores = ["*/__init__.py: F401"]
+
 [tool.mypy]
+namespace_packages = true
+show_error_codes = true
+explicit_package_bases = true
+ignore_missing_imports = true
+pretty = true
 mypy_path = "third-party-stubs/"
+files = [
+    "dbt",
+    "tests/unit",
+]
+exclude = [
+    "dbt/adapters/events/adapter_types_pb2.py",
+    "dbt-tests-adapter/dbt/__init__.py",  # overlaps with `dbt/__init__.py` as expected for namespaces
+    "venv",
+]
 [[tool.mypy.overrides]]
 module = ["dbt.adapters.events.adapter_types_pb2"]
 follow_imports = "skip"

dbt_adapters-1.1.0/dbt/adapters/__about__.py

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