Skip to content

Commit

Permalink
prepare draft pr for dbt-common name change in core
Browse files Browse the repository at this point in the history
  • Loading branch information
McKnight-42 committed Jan 12, 2024
1 parent 7aca13d commit 7df841c
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion dbt/adapters/snowflake/column.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 6 additions & 6 deletions dbt/adapters/snowflake/connections.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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")
Expand Down Expand Up @@ -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]:
Expand Down
6 changes: 3 additions & 3 deletions dbt/adapters/snowflake/impl.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dbt/adapters/snowflake/relation_configs/policies.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_snowflake_adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down Expand Up @@ -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()
Expand Down

0 comments on commit 7df841c

Please sign in to comment.