diff --git a/dbt/adapters/snowflake/column.py b/dbt/adapters/snowflake/column.py index 61e37f6cc..de92a051f 100644 --- a/dbt/adapters/snowflake/column.py +++ b/dbt/adapters/snowflake/column.py @@ -1,7 +1,7 @@ from dataclasses import dataclass from dbt.adapters.base.column import Column -from dbt.common.exceptions import DbtRuntimeError +from dbt_common.exceptions import DbtRuntimeError @dataclass diff --git a/dbt/adapters/snowflake/connections.py b/dbt/adapters/snowflake/connections.py index f2f0bddd6..bffd62ad9 100644 --- a/dbt/adapters/snowflake/connections.py +++ b/dbt/adapters/snowflake/connections.py @@ -11,7 +11,7 @@ from typing import Optional, Tuple, Union, Any, List import agate -import dbt.common.clients.agate_helper +import dbt_common.clients.agate_helper from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives import serialization @@ -32,20 +32,20 @@ BindUploadError, ) -from dbt.common.exceptions import ( +from dbt_common.exceptions import ( DbtInternalError, DbtRuntimeError, DbtConfigError, ) -from dbt.common.exceptions import DbtDatabaseError +from dbt_common.exceptions import DbtDatabaseError from dbt.adapters.base import Credentials # type: ignore from dbt.adapters.exceptions.connection import FailedToConnectError from dbt.adapters.contracts.connection import AdapterResponse, Connection from dbt.adapters.sql import SQLConnectionManager # type: ignore from dbt.adapters.events.logging import AdapterLogger # type: ignore -from dbt.common.events.functions import warn_or_error +from dbt_common.events.functions import warn_or_error from dbt.adapters.events.types import AdapterEventWarning -from dbt.common.ui import line_wrap_message, warning_tag +from dbt_common.ui import line_wrap_message, warning_tag logger = AdapterLogger("Snowflake") @@ -476,7 +476,7 @@ def execute( if fetch: table = self.get_result_from_cursor(cursor, limit) else: - table = dbt.common.clients.agate_helper.empty_table() + table = dbt_common.clients.agate_helper.empty_table() return response, table def add_standard_query(self, sql: str, **kwargs) -> Tuple[Connection, Any]: diff --git a/dbt/adapters/snowflake/impl.py b/dbt/adapters/snowflake/impl.py index 40b54b61b..4dc57a1b4 100644 --- a/dbt/adapters/snowflake/impl.py +++ b/dbt/adapters/snowflake/impl.py @@ -15,9 +15,9 @@ from dbt.adapters.snowflake import SnowflakeConnectionManager from dbt.adapters.snowflake import SnowflakeRelation from dbt.adapters.snowflake import SnowflakeColumn -from dbt.common.contracts.constraints import ConstraintType -from dbt.common.exceptions import CompilationError, DbtDatabaseError, DbtRuntimeError -from dbt.common.utils import filter_null_values +from dbt_common.contracts.constraints import ConstraintType +from dbt_common.exceptions import CompilationError, DbtDatabaseError, DbtRuntimeError +from dbt_common.utils import filter_null_values @dataclass diff --git a/dbt/adapters/snowflake/relation_configs/policies.py b/dbt/adapters/snowflake/relation_configs/policies.py index f0872f992..75195f9a3 100644 --- a/dbt/adapters/snowflake/relation_configs/policies.py +++ b/dbt/adapters/snowflake/relation_configs/policies.py @@ -1,7 +1,7 @@ from dataclasses import dataclass from dbt.adapters.base.relation import Policy -from dbt.common.dataclass_schema import StrEnum +from dbt_common.dataclass_schema import StrEnum class SnowflakeRelationType(StrEnum): diff --git a/tests/functional/adapter/dynamic_table_tests/test_dynamic_tables_changes.py b/tests/functional/adapter/dynamic_table_tests/test_dynamic_tables_changes.py index 17d14ebd8..984454fb9 100644 --- a/tests/functional/adapter/dynamic_table_tests/test_dynamic_tables_changes.py +++ b/tests/functional/adapter/dynamic_table_tests/test_dynamic_tables_changes.py @@ -2,7 +2,7 @@ import pytest -from dbt.common.contracts.config.materialization import OnConfigurationChangeOption +from dbt_common.contracts.config.materialization import OnConfigurationChangeOption from dbt.tests.util import ( assert_message_in_logs, get_model_file, diff --git a/tests/unit/test_snowflake_adapter.py b/tests/unit/test_snowflake_adapter.py index 19f2165d1..a9f8f3572 100644 --- a/tests/unit/test_snowflake_adapter.py +++ b/tests/unit/test_snowflake_adapter.py @@ -13,7 +13,7 @@ from dbt.context.manifest import generate_query_header_context from dbt.context.providers import generate_runtime_macro_context from dbt.contracts.graph.manifest import ManifestStateCheck -from dbt.common.clients import agate_helper +from dbt_common.clients import agate_helper from snowflake import connector as snowflake_connector from .utils import ( diff --git a/tests/unit/utils.py b/tests/unit/utils.py index 042e24bf2..b2b308185 100644 --- a/tests/unit/utils.py +++ b/tests/unit/utils.py @@ -9,7 +9,7 @@ import agate import pytest -from dbt.common.dataclass_schema import ValidationError +from dbt_common.dataclass_schema import ValidationError from dbt.config.project import PartialProject @@ -230,7 +230,7 @@ def assert_fails_validation(dct, cls): class TestAdapterConversions(TestCase): def _get_tester_for(self, column_type): - from dbt.common.clients import agate_helper + from dbt_common.clients import agate_helper if column_type is agate.TimeDelta: # dbt never makes this! return agate.TimeDelta()