remove dbt.contracts.connection imports from adapter module

Author: MichelleArk

core/dbt/adapters/base/__init__.py

@@ -1,7 +1,7 @@
 # these are all just exports, #noqa them so flake8 will be happy
 
 # TODO: Should we still include this in the `adapters` namespace?
-from dbt.contracts.connection import Credentials  # noqa: F401
+from dbt.adapters.contracts.connection import Credentials  # noqa: F401
 from dbt.adapters.base.meta import available  # noqa: F401
 from dbt.adapters.base.connections import BaseConnectionManager  # noqa: F401
 from dbt.adapters.base.relation import (  # noqa: F401

core/dbt/adapters/base/connections.py

@@ -24,7 +24,7 @@
 import agate
 
 import dbt.exceptions
-from dbt.contracts.connection import (
+from dbt.adapters.contracts.connection import (
     Connection,
     Identifier,
     ConnectionState,

core/dbt/adapters/base/query_headers.py

@@ -4,7 +4,7 @@
 from dbt.clients.jinja import QueryStringGenerator
 
 from dbt.context.manifest import generate_query_header_context
-from dbt.contracts.connection import AdapterRequiredConfig, QueryComment
+from dbt.adapters.contracts.connection import AdapterRequiredConfig, QueryComment
 from dbt.contracts.graph.nodes import ResultNode
 from dbt.contracts.graph.manifest import Manifest
 from dbt.exceptions import DbtRuntimeError

core/dbt/contracts/connection.py renamed to core/dbt/adapters/contracts/connection.py

@@ -11,20 +11,27 @@
     List,
     Callable,
 )
-from dbt.exceptions import DbtInternalError
-from dbt.utils import translate_aliases, md5
-from dbt.events.functions import fire_event
-from dbt.events.types import NewConnectionOpening
-from dbt.events.contextvars import get_node_info
 from typing_extensions import Protocol, Annotated
-from dbt.dataclass_schema import (
+
+from mashumaro.jsonschema.annotations import Pattern
+
+from dbt.adapters.utils import translate_aliases
+from dbt.common.exceptions import DbtInternalError
+from dbt.common.dataclass_schema import (
     dbtClassMixin,
     StrEnum,
     ExtensibleDbtClassMixin,
     ValidatedStringMixin,
 )
-from dbt.contracts.util import Replaceable
-from mashumaro.jsonschema.annotations import Pattern
+from dbt.common.contracts.util import Replaceable
+from dbt.common.util import md5
+
+# TODO: dbt.events dependency
+from dbt.events.functions import fire_event
+from dbt.events.types import NewConnectionOpening
+
+# TODO: this is a very bad dependency - shared global state
+from dbt.events.contextvars import get_node_info
 
 
 class Identifier(ValidatedStringMixin):

core/dbt/adapters/exceptions.py

@@ -0,0 +1,24 @@
+from typing import Mapping, Any
+
+from dbt.exceptions import DbtValidationError
+
+
+class AliasError(DbtValidationError):
+    pass
+
+
+# core level exceptions
+class DuplicateAliasError(AliasError):
+    def __init__(self, kwargs: Mapping[str, Any], aliases: Mapping[str, str], canonical_key: str):
+        self.kwargs = kwargs
+        self.aliases = aliases
+        self.canonical_key = canonical_key
+        super().__init__(msg=self.get_message())
+
+    def get_message(self) -> str:
+        # dupe found: go through the dict so we can have a nice-ish error
+        key_names = ", ".join(
+            "{}".format(k) for k in self.kwargs if self.aliases.get(k) == self.canonical_key
+        )
+        msg = f'Got duplicate keys: ({key_names}) all map to "{self.canonical_key}"'
+        return msg

core/dbt/adapters/factory.py

@@ -7,7 +7,7 @@
 
 from dbt.adapters.base.plugin import AdapterPlugin
 from dbt.adapters.protocol import AdapterConfig, AdapterProtocol, RelationProtocol
-from dbt.contracts.connection import AdapterRequiredConfig, Credentials
+from dbt.adapters.contracts.connection import AdapterRequiredConfig, Credentials
 from dbt.events.functions import fire_event
 from dbt.events.types import AdapterImportError, PluginLoadError, AdapterRegistered
 from dbt.exceptions import DbtInternalError, DbtRuntimeError

core/dbt/adapters/protocol.py

@@ -15,7 +15,7 @@
 
 import agate
 
-from dbt.contracts.connection import Connection, AdapterRequiredConfig, AdapterResponse
+from dbt.adapters.contracts.connection import Connection, AdapterRequiredConfig, AdapterResponse
 from dbt.contracts.graph.nodes import ResultNode, ManifestNode
 from dbt.contracts.graph.model_config import BaseConfig
 from dbt.contracts.graph.manifest import Manifest

core/dbt/adapters/relation_configs/config_change.py

@@ -3,7 +3,7 @@
 from typing import Hashable
 
 from dbt.adapters.relation_configs.config_base import RelationConfigBase
-from dbt.dataclass_schema import StrEnum
+from dbt.common.dataclass_schema import StrEnum
 
 
 class RelationConfigChangeAction(StrEnum):

core/dbt/adapters/sql/connections.py

@@ -7,7 +7,7 @@
 import dbt.clients.agate_helper
 import dbt.exceptions
 from dbt.adapters.base import BaseConnectionManager
-from dbt.contracts.connection import Connection, ConnectionState, AdapterResponse
+from dbt.adapters.contracts.connection import Connection, ConnectionState, AdapterResponse
 from dbt.events.functions import fire_event
 from dbt.events.types import ConnectionUsed, SQLQuery, SQLCommit, SQLQueryStatus
 from dbt.events.contextvars import get_node_info

core/dbt/adapters/sql/impl.py

@@ -1,7 +1,7 @@
 import agate
 from typing import Any, Optional, Tuple, Type, List
 
-from dbt.contracts.connection import Connection, AdapterResponse
+from dbt.adapters.contracts.connection import Connection, AdapterResponse
 from dbt.exceptions import RelationTypeNullError
 from dbt.adapters.base import BaseAdapter, available
 from dbt.adapters.cache import _make_ref_key_dict