From 40fca9306dac2996a864b240a01b6266253af926 Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 1 Oct 2024 14:25:50 -0700 Subject: [PATCH] add dep on dbt_config & and update protocol --- dbt/adapters/contracts/connection.py | 3 +++ pyproject.toml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dbt/adapters/contracts/connection.py b/dbt/adapters/contracts/connection.py index e3baf284..2b694e00 100644 --- a/dbt/adapters/contracts/connection.py +++ b/dbt/adapters/contracts/connection.py @@ -19,6 +19,8 @@ ValidatedStringMixin, dbtClassMixin, ) +from dbt_config.external_config import ExternalCatalogConfig + # TODO: this is a very bad dependency - shared global state from dbt_common.events.contextvars import get_node_info @@ -226,3 +228,4 @@ class AdapterRequiredConfig(HasCredentials, Protocol): cli_vars: Dict[str, Any] target_path: str log_cache_events: bool + catalogs = Optional[ExternalCatalogConfig] diff --git a/pyproject.toml b/pyproject.toml index 76ca3dee..6356078e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,6 +25,7 @@ classifiers = [ ] dependencies = [ "dbt-common>=1.10,<2.0", + "dbt-config>=0.1,<1.0", "pytz>=2015.7", # installed via dbt-common but used directly "agate>=1.0,<2.0", @@ -54,6 +55,7 @@ include = ["dbt/adapters", "dbt/include", "dbt/__init__.py"] [tool.hatch.envs.default] dependencies = [ + "dbt-config @ git+https://github.com/dbt-labs/dbt-common.git@feature/externalCatalogConfig#subdirectory=config", "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"',