Merge pull request #320 from datafold/nov25_cleanup

Cleanup

Author: erezsh

data_diff/databases/_connect.py

@@ -1,4 +1,4 @@
-from data_diff.sqeleton.databases.connect import Connect
+from data_diff.sqeleton.databases import Connect
 
 from .postgresql import PostgreSQL
 from .mysql import MySQL

data_diff/hashdiff_tables.py

@@ -11,7 +11,7 @@
 
 from .utils import safezip
 from .thread_utils import ThreadedYielder
-from .sqeleton.abcs.database_types import ColType_UUID, NumericType, PrecisionType, StringType
+from .sqeleton.abcs import ColType_UUID, NumericType, PrecisionType, StringType
 from .table_segment import TableSegment
 
 from .diff_tables import TableDiffer

data_diff/joindiff_tables.py

@@ -10,15 +10,27 @@
 
 from runtype import dataclass
 
-from .sqeleton.databases import Database, MySQL, BigQuery, Presto, Oracle, Snowflake
-from .sqeleton.abcs.database_types import DbPath, NumericType
-from .sqeleton.queries import table, sum_, min_, max_, avg
-from .sqeleton.queries.api import and_, if_, or_, outerjoin, leftjoin, rightjoin, this, ITable
-from .sqeleton.queries.ast_classes import Concat, Count, Expr, Random, TablePath, Code
-from .sqeleton.queries.compiler import Compiler
+from .sqeleton.databases import Database, MySQL, BigQuery, Presto, Oracle, Snowflake, DbPath
+from .sqeleton.abcs import NumericType
+from .sqeleton.queries import (
+    table,
+    sum_,
+    min_,
+    max_,
+    avg,
+    and_,
+    if_,
+    or_,
+    outerjoin,
+    leftjoin,
+    rightjoin,
+    this,
+    Compiler,
+)
+from .sqeleton.queries.ast_classes import Concat, Count, Expr, Random, TablePath, Code, ITable
 from .sqeleton.queries.extras import NormalizeAsString
 
-from .info_tree import InfoTree, SegmentInfo
+from .info_tree import InfoTree
 
 from .query_utils import append_to_table, drop_table
 from .utils import safezip

data_diff/sqeleton/abcs/__init__.py

@@ -1,2 +1,13 @@
-from .database_types import AbstractDatabase, AbstractDialect, DbKey, DbPath, DbTime, IKey
+from .database_types import (
+    AbstractDatabase,
+    AbstractDialect,
+    DbKey,
+    DbPath,
+    DbTime,
+    IKey,
+    ColType_UUID,
+    NumericType,
+    PrecisionType,
+    StringType,
+)
 from .compiler import AbstractCompiler, Compilable

data_diff/sqeleton/databases/__init__.py

@@ -1,5 +1,6 @@
 from .base import MD5_HEXDIGITS, CHECKSUM_HEXDIGITS, QueryError, ConnectError, BaseDialect, Database
-from ..abcs import DbPath, DbKey
+from ..abcs import DbPath, DbKey, DbTime
+from .connect import Connect
 
 from .postgresql import PostgreSQL
 from .mysql import MySQL

data_diff/sqeleton/queries/__init__.py

@@ -1,4 +1,23 @@
 from .compiler import Compiler
-from .api import this, join, outerjoin, table, SKIP, sum_, avg, min_, max_, cte, commit, when, coalesce
+from .api import (
+    this,
+    join,
+    outerjoin,
+    table,
+    SKIP,
+    sum_,
+    avg,
+    min_,
+    max_,
+    cte,
+    commit,
+    when,
+    coalesce,
+    and_,
+    if_,
+    or_,
+    leftjoin,
+    rightjoin,
+)
 from .ast_classes import Expr, ExprNode, Select, Count, BinOp, Explain, In, Code, Column
 from .extras import Checksum, NormalizeAsString, ApplyFuncAndNormalizeAsString

data_diff/table_segment.py

@@ -5,8 +5,7 @@
 from runtype import dataclass
 
 from .sqeleton.utils import ArithString, split_space
-from .sqeleton.databases import Database
-from .sqeleton.abcs import DbPath, DbKey, DbTime
+from .sqeleton.databases import Database, DbPath, DbKey, DbTime
 from .sqeleton.schema import Schema, create_schema
 from .sqeleton.queries import Count, Checksum, SKIP, table, this, Expr, min_, max_, Code
 from .sqeleton.queries.extras import ApplyFuncAndNormalizeAsString, NormalizeAsString

tests/common.py

@@ -12,7 +12,7 @@
 from data_diff import databases as db
 from data_diff import tracking
 from data_diff import connect
-from data_diff.sqeleton.queries.api import table
+from data_diff.sqeleton.queries import table
 from data_diff.sqeleton.databases import Database
 from data_diff.query_utils import drop_table
 

tests/sqeleton/test_database.py

@@ -4,9 +4,6 @@
 from ..common import str_to_checksum, TEST_MYSQL_CONN_STRING
 from ..common import str_to_checksum, test_each_database_in_list, DiffTestCase, get_conn, random_table_suffix
 
-# from data_diff.sqeleton import databases as db
-# from data_diff.sqeleton import connect
-
 from data_diff.sqeleton.queries import table
 
 from data_diff import databases as dbs

tests/test_database_types.py

@@ -14,7 +14,6 @@
 from parameterized import parameterized
 
 from data_diff import databases as db
-from data_diff.databases import postgresql, oracle, duckdb
 from data_diff.query_utils import drop_table
 from data_diff.utils import accumulate
 from data_diff.sqeleton.utils import number_to_human