move agate_helper into common

dbt-labs · Oct 25, 2023 · f44d704 · f44d704
1 parent dbd02e5
commit f44d704
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/core/dbt/adapters/base/impl.py b/core/dbt/adapters/base/impl.py
@@ -46,7 +46,7 @@
 )
 
 from dbt.adapters.protocol import AdapterConfig
-from dbt.clients.agate_helper import (
+from dbt.common.clients.agate_helper import (
     empty_table,
     get_column_value_uncased,
     merge_tables,

diff --git a/core/dbt/adapters/sql/connections.py b/core/dbt/adapters/sql/connections.py
@@ -4,7 +4,7 @@
 
 import agate
 
-import dbt.clients.agate_helper
+import dbt.common.clients.agate_helper
 import dbt.exceptions
 from dbt.adapters.base import BaseConnectionManager
 from dbt.adapters.contracts.connection import Connection, ConnectionState, AdapterResponse
@@ -129,7 +129,7 @@ def get_result_from_cursor(cls, cursor: Any, limit: Optional[int]) -> agate.Tabl
                 rows = cursor.fetchall()
             data = cls.process_results(column_names, rows)
 
-        return dbt.clients.agate_helper.table_from_data_flat(data, column_names)
+        return dbt.common.clients.agate_helper.table_from_data_flat(data, column_names)
 
     def execute(
         self, sql: str, auto_begin: bool = False, fetch: bool = False, limit: Optional[int] = None
@@ -140,7 +140,7 @@ def execute(
         if fetch:
             table = self.get_result_from_cursor(cursor, limit)
         else:
-            table = dbt.clients.agate_helper.empty_table()
+            table = dbt.common.clients.agate_helper.empty_table()
         return response, table
 
     def add_begin_query(self):

diff --git a/core/dbt/common/clients/__init__.py b/core/dbt/common/clients/__init__.py
diff --git a/core/dbt/clients/agate_helper.py → core/dbt/common/clients/agate_helper.py b/core/dbt/clients/agate_helper.py → core/dbt/common/clients/agate_helper.py
diff --git a/core/dbt/context/providers.py b/core/dbt/context/providers.py
@@ -16,7 +16,7 @@
 
 from dbt.adapters.base.column import Column
 from dbt.adapters.factory import get_adapter, get_adapter_package_names, get_adapter_type_names
-from dbt.clients import agate_helper
+from dbt.common.clients import agate_helper
 from dbt.clients.jinja import get_rendered, MacroGenerator, MacroStack
 from dbt.config import RuntimeConfig, Project
 from dbt.constants import SECRET_ENV_PREFIX, DEFAULT_ENV_PLACEHOLDER

diff --git a/core/dbt/exceptions.py b/core/dbt/exceptions.py
@@ -2245,7 +2245,7 @@ def __init__(self, yaml_columns, sql_columns):
 
     def get_mismatches(self) -> agate.Table:
         # avoid a circular import
-        from dbt.clients.agate_helper import table_from_data_flat
+        from dbt.common.clients.agate_helper import table_from_data_flat
 
         column_names = ["column_name", "definition_type", "contract_type", "mismatch_reason"]
         # list of mismatches

diff --git a/tests/unit/test_agate_helper.py → tests/common/unit/test_agate_helper.py b/tests/unit/test_agate_helper.py → tests/common/unit/test_agate_helper.py
@@ -8,7 +8,7 @@
 import os
 from shutil import rmtree
 from tempfile import mkdtemp
-from dbt.clients import agate_helper
+from dbt.common.clients import agate_helper
 
 SAMPLE_CSV_DATA = """a,b,c,d,e,f,g
 1,n,test,3.2,20180806T11:33:29.320Z,True,NULL

diff --git a/tests/unit/test_postgres_adapter.py b/tests/unit/test_postgres_adapter.py
@@ -10,7 +10,7 @@
 from dbt.adapters.postgres import Plugin as PostgresPlugin
 from dbt.contracts.files import FileHash
 from dbt.contracts.graph.manifest import ManifestStateCheck
-from dbt.clients import agate_helper
+from dbt.common.clients import agate_helper
 from dbt.exceptions import DbtValidationError, DbtConfigError
 from psycopg2 import extensions as psycopg2_extensions
 from psycopg2 import DatabaseError

diff --git a/tests/unit/utils.py b/tests/unit/utils.py
@@ -253,7 +253,7 @@ def generate_name_macros(package):
 
 class TestAdapterConversions(TestCase):
     def _get_tester_for(self, column_type):
-        from dbt.clients import agate_helper
+        from dbt.common.clients import agate_helper
 
         if column_type is agate.TimeDelta:  # dbt never makes this!
             return agate.TimeDelta()