Squash the modules of databases & dialects from sqeleton & data_diff

Author: Sergey Vasilyev

data_diff/__init__.py

@@ -1,9 +1,8 @@
 from typing import Sequence, Tuple, Iterator, Optional, Union
 
-from data_diff.sqeleton.abcs import DbTime, DbPath
-
+from data_diff.abcs.database_types import DbTime, DbPath
 from data_diff.tracking import disable_tracking
-from data_diff.databases import connect
+from data_diff.databases._connect import connect
 from data_diff.diff_tables import Algorithm
 from data_diff.hashdiff_tables import HashDiffer, DEFAULT_BISECTION_THRESHOLD, DEFAULT_BISECTION_FACTOR
 from data_diff.joindiff_tables import JoinDiffer, TABLE_WRITE_LIMIT

data_diff/__main__.py

@@ -12,16 +12,16 @@
 from rich.logging import RichHandler
 import click
 
-from data_diff.sqeleton.schema import create_schema
-from data_diff.sqeleton.queries.api import current_timestamp
+from data_diff.schema import create_schema
+from data_diff.queries.api import current_timestamp
 
 from data_diff.dbt import dbt_diff
 from data_diff.utils import eval_name_template, remove_password_from_url, safezip, match_like, LogStatusHandler
 from data_diff.diff_tables import Algorithm
 from data_diff.hashdiff_tables import HashDiffer, DEFAULT_BISECTION_THRESHOLD, DEFAULT_BISECTION_FACTOR
 from data_diff.joindiff_tables import TABLE_WRITE_LIMIT, JoinDiffer
 from data_diff.table_segment import TableSegment
-from data_diff.databases import connect
+from data_diff.databases._connect import connect
 from data_diff.parse_time import parse_time_before, UNITS_STR, ParseError
 from data_diff.config import apply_config_from_file
 from data_diff.tracking import disable_tracking, set_entrypoint_name

data_diff/abcs/__init__.py

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from data_diff.sqeleton.abcs.database_types import (
+from data_diff.abcs.database_types import (
     Array,
     TemporalType,
     FractionalType,
@@ -10,7 +10,7 @@
     JSON,
     Struct,
 )
-from data_diff.sqeleton.abcs.compiler import Compilable
+from data_diff.abcs.compiler import Compilable
 
 
 class AbstractMixin(ABC):

data_diff/sqeleton/abcs/compiler.py renamed to data_diff/abcs/compiler.py

@@ -7,10 +7,11 @@
 from runtype import dataclass
 from typing_extensions import Self
 
-from data_diff.sqeleton.abcs import AbstractDatabase, AbstractCompiler
-from data_diff.sqeleton.queries.ast_classes import ExprNode, ITable, TablePath, Compilable
-from data_diff.sqeleton.queries.api import table
-from data_diff.sqeleton.schema import create_schema
+from data_diff.abcs.database_types import AbstractDatabase
+from data_diff.abcs.compiler import AbstractCompiler
+from data_diff.queries.ast_classes import ExprNode, TablePath, Compilable
+from data_diff.queries.api import table
+from data_diff.schema import create_schema
 
 
 @dataclass
@@ -80,8 +81,8 @@ def bound_table(database: AbstractDatabase, table_path: Union[TablePath, str, tu
 # Database.table = bound_table
 
 # def test():
-#     from data_diff.sqeleton. import connect
-#     from data_diff.sqeleton.queries.api import table
+#     from data_diff import connect
+#     from data_diff.queries.api import table
 #     d = connect("mysql://erez:qweqwe123@localhost/erez")
 #     t = table(('Rating',))
 

data_diff/sqeleton/abcs/database_types.py renamed to data_diff/abcs/database_types.py

@@ -15,7 +15,7 @@
     TDsConfig,
     TestDataSourceStatus,
 )
-from data_diff.cloud.dbt_parser import DbtParser
+from data_diff.dbt_parser import DbtParser
 
 
 UNKNOWN_VALUE = "unknown_value"

data_diff/sqeleton/abcs/mixins.py renamed to data_diff/abcs/mixins.py

@@ -9,8 +9,7 @@
 from typing_extensions import Self
 
 from data_diff.errors import DataDiffCloudDiffFailed, DataDiffCloudDiffTimedOut, DataDiffDatasourceIdNotFoundError
-
-from data_diff.cloud.utils import getLogger
+from data_diff.utils import getLogger
 
 logger = getLogger(__name__)
 

data_diff/sqeleton/bound_exprs.py renamed to data_diff/bound_exprs.py

@@ -1,17 +1,16 @@
-from data_diff.sqeleton.databases import MD5_HEXDIGITS, CHECKSUM_HEXDIGITS, QueryError, ConnectError
-
-from data_diff.sqeleton.databases.postgresql import PostgreSQL as PostgreSQL
-from data_diff.sqeleton.databases.mysql import MySQL as MySQL
-from data_diff.sqeleton.databases.oracle import Oracle as Oracle
-from data_diff.sqeleton.databases.snowflake import Snowflake as Snowflake
-from data_diff.sqeleton.databases.bigquery import BigQuery as BigQuery
-from data_diff.sqeleton.databases.redshift import Redshift as Redshift
-from data_diff.sqeleton.databases.presto import Presto as Presto
-from data_diff.sqeleton.databases.databricks import Databricks as Databricks
-from data_diff.sqeleton.databases.trino import Trino as Trino
-from data_diff.sqeleton.databases.clickhouse import Clickhouse as Clickhouse
-from data_diff.sqeleton.databases.vertica import Vertica as Vertica
-from data_diff.sqeleton.databases.duckdb import DuckDB as DuckDB
-from data_diff.sqeleton.databases.mssql import MsSQL as MsSql
-
-from data_diff.databases._connect import connect
+from data_diff.databases.base import MD5_HEXDIGITS, CHECKSUM_HEXDIGITS, QueryError, ConnectError, BaseDialect, Database
+from data_diff.databases._connect import connect as connect
+from data_diff.databases._connect import Connect as Connect
+from data_diff.databases.postgresql import PostgreSQL as PostgreSQL
+from data_diff.databases.mysql import MySQL as MySQL
+from data_diff.databases.oracle import Oracle as Oracle
+from data_diff.databases.snowflake import Snowflake as Snowflake
+from data_diff.databases.bigquery import BigQuery as BigQuery
+from data_diff.databases.redshift import Redshift as Redshift
+from data_diff.databases.presto import Presto as Presto
+from data_diff.databases.databricks import Databricks as Databricks
+from data_diff.databases.trino import Trino as Trino
+from data_diff.databases.clickhouse import Clickhouse as Clickhouse
+from data_diff.databases.vertica import Vertica as Vertica
+from data_diff.databases.duckdb import DuckDB as DuckDB
+from data_diff.databases.mssql import MsSQL as MsSQL