Revert "replace dbt/common with dbt-common"

core/dbt/README.md

@@ -22,6 +22,8 @@
 
 ### links.py
 
+### logger.py
+
 ### main.py
 
 ### node_types.py

core/dbt/adapters/base/column.py

@@ -2,7 +2,7 @@
 import re
 from typing import Dict, ClassVar, Any, Optional
 
-from dbt_common.exceptions import DbtRuntimeError
+from dbt.common.exceptions import DbtRuntimeError
 
 
 @dataclass

core/dbt/adapters/base/connections.py

@@ -25,7 +25,7 @@
 import agate
 
 import dbt.adapters.exceptions
-import dbt_common.exceptions.base
+import dbt.common.exceptions.base
 from dbt.adapters.contracts.connection import (
     Connection,
     Identifier,
@@ -38,7 +38,7 @@
     MacroQueryStringSetter,
 )
 from dbt.adapters.events.logging import AdapterLogger
-from dbt_common.events.functions import fire_event
+from dbt.common.events.functions import fire_event
 from dbt.adapters.events.types import (
     NewConnection,
     ConnectionReused,
@@ -49,8 +49,8 @@
     Rollback,
     RollbackFailed,
 )
-from dbt_common.events.contextvars import get_node_info
-from dbt_common.utils import cast_to_str
+from dbt.common.events.contextvars import get_node_info
+from dbt.common.utils import cast_to_str
 
 SleepTime = Union[int, float]  # As taken by time.sleep.
 AdapterHandle = Any  # Adapter connection handle objects can be any class.
@@ -99,7 +99,7 @@
     def set_thread_connection(self, conn: Connection) -> None:
         key = self.get_thread_identifier()
         if key in self.thread_connections:
-            raise dbt_common.exceptions.DbtInternalError(
+            raise dbt.common.exceptions.DbtInternalError(
                 "In set_thread_connection, existing connection exists for {}"
             )
         self.thread_connections[key] = conn
@@ -139,7 +139,7 @@
         :return: A context manager that handles exceptions raised by the
             underlying database.
         """
-        raise dbt_common.exceptions.base.NotImplementedError(
+        raise dbt.common.exceptions.base.NotImplementedError(
             "`exception_handler` is not implemented for this adapter!"
         )
 
@@ -275,7 +275,7 @@
     @abc.abstractmethod
     def cancel_open(self) -> Optional[List[str]]:
         """Cancel all open connections on the adapter. (passable)"""
-        raise dbt_common.exceptions.base.NotImplementedError(
+        raise dbt.common.exceptions.base.NotImplementedError(
             "`cancel_open` is not implemented for this adapter!"
         )
 
@@ -290,7 +290,7 @@
         This should be thread-safe, or hold the lock if necessary. The given
         connection should not be in either in_use or available.
         """
-        raise dbt_common.exceptions.base.NotImplementedError(
+        raise dbt.common.exceptions.base.NotImplementedError(
             "`open` is not implemented for this adapter!"
         )
 
@@ -324,14 +324,14 @@
     @abc.abstractmethod
     def begin(self) -> None:
         """Begin a transaction. (passable)"""
-        raise dbt_common.exceptions.base.NotImplementedError(
+        raise dbt.common.exceptions.base.NotImplementedError(
             "`begin` is not implemented for this adapter!"
         )
 
     @abc.abstractmethod
     def commit(self) -> None:
         """Commit a transaction. (passable)"""
-        raise dbt_common.exceptions.base.NotImplementedError(
+        raise dbt.common.exceptions.base.NotImplementedError(
             "`commit` is not implemented for this adapter!"
         )
 
@@ -369,7 +369,7 @@
     def _rollback(cls, connection: Connection) -> None:
         """Roll back the given connection."""
         if connection.transaction_open is False:
-            raise dbt_common.exceptions.DbtInternalError(
+            raise dbt.common.exceptions.DbtInternalError(
                 f"Tried to rollback transaction on connection "
                 f'"{connection.name}", but it does not have one open!'
             )
@@ -420,7 +420,7 @@
         :return: A tuple of the query status and results (empty if fetch=False).
         :rtype: Tuple[AdapterResponse, agate.Table]
         """
-        raise dbt_common.exceptions.base.NotImplementedError(
+        raise dbt.common.exceptions.base.NotImplementedError(
             "`execute` is not implemented for this adapter!"
         )
 
@@ -432,14 +432,14 @@
 
         See https://github.com/dbt-labs/dbt-core/issues/8396 for more information.
         """
-        raise dbt_common.exceptions.base.NotImplementedError(
+        raise dbt.common.exceptions.base.NotImplementedError(
             "`add_select_query` is not implemented for this adapter!"
         )
 
     @classmethod
     def data_type_code_to_name(cls, type_code: Union[int, str]) -> str:
         """Get the string representation of the data type from the type_code."""
         # https://peps.python.org/pep-0249/#type-objects
-        raise dbt_common.exceptions.base.NotImplementedError(
+        raise dbt.common.exceptions.base.NotImplementedError(
             "`data_type_code_to_name` is not implemented for this adapter!"
         )

core/dbt/adapters/base/impl.py

@@ -23,7 +23,7 @@
 from multiprocessing.context import SpawnContext
 
 from dbt.adapters.capability import Capability, CapabilityDict
-from dbt_common.contracts.constraints import (
+from dbt.common.contracts.constraints import (
     ColumnLevelConstraint,
     ConstraintType,
     ModelLevelConstraint,
@@ -44,7 +44,7 @@
     QuoteConfigTypeError,
 )
 
-from dbt_common.exceptions import (
+from dbt.common.exceptions import (
     NotImplementedError,
     DbtInternalError,
     DbtRuntimeError,
@@ -58,15 +58,15 @@
     AdapterConfig,
     MacroContextGeneratorCallable,
 )
-from dbt_common.clients.agate_helper import (
+from dbt.common.clients.agate_helper import (
     empty_table,
     get_column_value_uncased,
     merge_tables,
     table_from_rows,
     Integer,
 )
-from dbt_common.clients.jinja import CallableMacroGenerator
-from dbt_common.events.functions import fire_event, warn_or_error
+from dbt.common.clients.jinja import CallableMacroGenerator
+from dbt.common.events.functions import fire_event, warn_or_error
 from dbt.adapters.events.types import (
     CacheMiss,
     ListRelations,
@@ -76,7 +76,7 @@
     ConstraintNotSupported,
     ConstraintNotEnforced,
 )
-from dbt_common.utils import filter_null_values, executor, cast_to_str, AttrDict
+from dbt.common.utils import filter_null_values, executor, cast_to_str, AttrDict
 
 from dbt.adapters.contracts.relation import RelationConfig
 from dbt.adapters.base.connections import (

core/dbt/adapters/base/meta.py

@@ -1,7 +1,7 @@
 import abc
 from functools import wraps
 from typing import Callable, Optional, Any, FrozenSet, Dict, Set
-from dbt_common.events.functions import warn_or_error
+from dbt.common.events.functions import warn_or_error
 from dbt.adapters.events.types import AdapterDeprecationWarning
 
 Decorator = Callable[[Any], Callable]

core/dbt/adapters/base/query_headers.py

@@ -3,7 +3,7 @@
 
 from dbt.adapters.clients.jinja import QueryStringGenerator
 from dbt.adapters.contracts.connection import AdapterRequiredConfig, QueryComment
-from dbt_common.exceptions import DbtRuntimeError
+from dbt.common.exceptions import DbtRuntimeError
 
 
 class QueryHeaderContextWrapper:

core/dbt/adapters/base/relation.py

@@ -12,10 +12,10 @@
     Path,
 )
 from dbt.adapters.exceptions import MultipleDatabasesNotAllowedError, ApproximateMatchError
-from dbt_common.utils import filter_null_values, deep_merge
+from dbt.common.utils import filter_null_values, deep_merge
 from dbt.adapters.utils import classproperty
 
-import dbt_common.exceptions
+import dbt.common.exceptions
 
 
 Self = TypeVar("Self", bound="BaseRelation")
@@ -97,7 +97,7 @@
 
         if not search:
             # nothing was passed in
-            raise dbt_common.exceptions.DbtRuntimeError(
+            raise dbt.common.exceptions.DbtRuntimeError(
                 "Tried to match relation, but no search path was passed!"
             )
 
@@ -360,7 +360,7 @@
 
     def __post_init__(self):
         if not isinstance(self.information_schema_view, (type(None), str)):
-            raise dbt_common.exceptions.CompilationError(
+            raise dbt.common.exceptions.CompilationError(
                 "Got an invalid name: {}".format(self.information_schema_view)
             )
 

core/dbt/adapters/cache.py

@@ -7,17 +7,16 @@
     _make_ref_key_dict,
     _ReferenceKey,
 )
-
 from dbt.adapters.exceptions.cache import (
     NewNameAlreadyInCacheError,
     ReferencedLinkNotCachedError,
     DependentLinkNotCachedError,
     TruncatedModelNameCausedCollisionError,
     NoneRelationFoundError,
 )
-from dbt_common.events.functions import fire_event, fire_event_if
+from dbt.common.events.functions import fire_event, fire_event_if
 from dbt.adapters.events.types import CacheAction, CacheDumpGraph
-from dbt_common.utils.formatting import lowercase
+from dbt.common.utils.formatting import lowercase
 
 
 def dot_separated(key: _ReferenceKey) -> str:

core/dbt/adapters/clients/jinja.py

@@ -1,5 +1,5 @@
 from typing import Dict, Any
-from dbt_common.clients.jinja import BaseMacroGenerator, get_environment
+from dbt.common.clients.jinja import BaseMacroGenerator, get_environment
 
 
 class QueryStringGenerator(BaseMacroGenerator):

core/dbt/adapters/contracts/connection.py

@@ -16,21 +16,21 @@
 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 (
+from dbt.common.exceptions import DbtInternalError
+from dbt.common.dataclass_schema import (
     dbtClassMixin,
     StrEnum,
     ExtensibleDbtClassMixin,
     ValidatedStringMixin,
 )
-from dbt_common.contracts.util import Replaceable
-from dbt_common.utils import md5
+from dbt.common.contracts.util import Replaceable
+from dbt.common.utils import md5
 
-from dbt_common.events.functions import fire_event
+from dbt.common.events.functions import fire_event
 from dbt.adapters.events.types import NewConnectionOpening
 
 # TODO: this is a very bad dependency - shared global state
-from dbt_common.events.contextvars import get_node_info
+from dbt.common.events.contextvars import get_node_info
 
 
 class Identifier(ValidatedStringMixin):

core/dbt/adapters/contracts/macros.py

@@ -1,7 +1,7 @@
 from typing import Optional
 from typing_extensions import Protocol
 
-from dbt_common.clients.jinja import MacroProtocol
+from dbt.common.clients.jinja import MacroProtocol
 
 
 class MacroResolverProtocol(Protocol):

core/dbt/adapters/contracts/relation.py

@@ -6,11 +6,11 @@
 )
 from typing_extensions import Protocol
 
-from dbt_common.dataclass_schema import dbtClassMixin, StrEnum
+from dbt.common.dataclass_schema import dbtClassMixin, StrEnum
 
-from dbt_common.contracts.util import Replaceable
-from dbt_common.exceptions import CompilationError, DataclassNotDictError
-from dbt_common.utils import deep_merge
+from dbt.common.contracts.util import Replaceable
+from dbt.common.exceptions import CompilationError, DataclassNotDictError
+from dbt.common.utils import deep_merge
 
 
 class RelationType(StrEnum):

core/dbt/adapters/events/base_types.py

@@ -1,5 +1,5 @@
 # Aliasing common Level classes in order to make custom, but not overly-verbose versions that have PROTO_TYPES_MODULE set to the adapter-specific generated types_pb2 module
-from dbt_common.events.base_types import (
+from dbt.common.events.base_types import (
     BaseEvent,
     DynamicLevel as CommonDyanicLevel,
     TestLevel as CommonTestLevel,

core/dbt/adapters/events/logging.py

@@ -7,10 +7,10 @@
     AdapterEventWarning,
     AdapterEventError,
 )
-from dbt_common.events import get_event_manager
-from dbt_common.events.contextvars import get_node_info
-from dbt_common.events.event_handler import set_package_logging
-from dbt_common.events.functions import fire_event
+from dbt.common.events import get_event_manager
+from dbt.common.events.contextvars import get_node_info
+from dbt.common.events.event_handler import set_package_logging
+from dbt.common.events.functions import fire_event
 
 
 @dataclass

core/dbt/adapters/events/types.py

@@ -1,5 +1,5 @@
 from dbt.adapters.events.base_types import WarnLevel, InfoLevel, ErrorLevel, DebugLevel
-from dbt_common.ui import line_wrap_message, warning_tag
+from dbt.common.ui import line_wrap_message, warning_tag
 
 
 def format_adapter_message(name, base_msg, args) -> str:

core/dbt/adapters/exceptions/alias.py

@@ -1,6 +1,6 @@
 from typing import Mapping, Any
 
-from dbt_common.exceptions import DbtValidationError
+from dbt.common.exceptions import DbtValidationError
 
 
 class AliasError(DbtValidationError):

core/dbt/adapters/exceptions/cache.py

@@ -1,7 +1,7 @@
 import re
 from typing import Dict
 
-from dbt_common.exceptions import DbtInternalError
+from dbt.common.exceptions import DbtInternalError
 
 
 class CacheInconsistencyError(DbtInternalError):

core/dbt/adapters/exceptions/compilation.py

@@ -1,7 +1,7 @@
 from typing import List, Mapping, Any
 
-from dbt_common.exceptions import CompilationError, DbtDatabaseError
-from dbt_common.ui import line_wrap_message
+from dbt.common.exceptions import CompilationError, DbtDatabaseError
+from dbt.common.ui import line_wrap_message
 
 
 class MissingConfigError(CompilationError):

core/dbt/adapters/exceptions/connection.py

@@ -1,6 +1,6 @@
 from typing import List
 
-from dbt_common.exceptions import DbtRuntimeError, DbtDatabaseError
+from dbt.common.exceptions import DbtRuntimeError, DbtDatabaseError
 
 
 class InvalidConnectionError(DbtRuntimeError):

core/dbt/adapters/exceptions/database.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from dbt_common.exceptions import NotImplementedError, CompilationError
+from dbt.common.exceptions import NotImplementedError, CompilationError
 
 
 class UnexpectedDbReferenceError(NotImplementedError):