Merge pull request #352 from datafold/sqeleton_dep

Swap sqeleton implementation to the external library

Author: erezsh

data_diff/__init__.py

@@ -1,8 +1,9 @@
 from typing import Sequence, Tuple, Iterator, Optional, Union
 
+from sqeleton.abcs import DbKey, DbTime, DbPath
+
 from .tracking import disable_tracking
 from .databases import connect
-from .sqeleton.abcs import DbKey, DbTime, DbPath
 from .diff_tables import Algorithm
 from .hashdiff_tables import HashDiffer, DEFAULT_BISECTION_THRESHOLD, DEFAULT_BISECTION_FACTOR
 from .joindiff_tables import JoinDiffer, TABLE_WRITE_LIMIT
@@ -94,7 +95,7 @@ def diff_tables(
         max_threadpool_size (int): Maximum size of each threadpool. ``None`` means auto.
                                    Only relevant when `threaded` is ``True``.
                                    There may be many pools, so number of actual threads can be a lot higher.
-        where (str, optional): An additional 'where' expression to restrict the search space.                   
+        where (str, optional): An additional 'where' expression to restrict the search space.
         algorithm (:class:`Algorithm`): Which diffing algorithm to use (`HASHDIFF` or `JOINDIFF`. Default=`AUTO`)
         bisection_factor (int): Into how many segments to bisect per iteration. (Used when algorithm is `HASHDIFF`)
         bisection_threshold (Number): Minimal row count of segment to bisect, otherwise download

data_diff/__main__.py

@@ -10,13 +10,14 @@
 import rich
 import click
 
+from sqeleton.schema import create_schema
+from sqeleton.queries.api import current_timestamp
+
 from .utils import eval_name_template, remove_password_from_url, safezip, match_like
 from .diff_tables import Algorithm
 from .hashdiff_tables import HashDiffer, DEFAULT_BISECTION_THRESHOLD, DEFAULT_BISECTION_FACTOR
 from .joindiff_tables import TABLE_WRITE_LIMIT, JoinDiffer
 from .table_segment import TableSegment
-from .sqeleton.schema import create_schema
-from .sqeleton.queries.api import current_timestamp
 from .databases import connect
 from .parse_time import parse_time_before, UNITS_STR, ParseError
 from .config import apply_config_from_file

data_diff/databases/__init__.py

@@ -1,4 +1,4 @@
-from data_diff.sqeleton.databases import MD5_HEXDIGITS, CHECKSUM_HEXDIGITS, QueryError, ConnectError
+from sqeleton.databases import MD5_HEXDIGITS, CHECKSUM_HEXDIGITS, QueryError, ConnectError
 
 from .postgresql import PostgreSQL
 from .mysql import MySQL

data_diff/databases/_connect.py

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

data_diff/databases/base.py

@@ -1,4 +1,4 @@
-from data_diff.sqeleton.abcs.mixins import AbstractMixin_MD5, AbstractMixin_NormalizeValue
+from sqeleton.abcs.mixins import AbstractMixin_MD5, AbstractMixin_NormalizeValue
 
 
 class DatadiffDialect(AbstractMixin_MD5, AbstractMixin_NormalizeValue):

data_diff/databases/bigquery.py

@@ -1,4 +1,4 @@
-from data_diff.sqeleton.databases import bigquery
+from sqeleton.databases import bigquery
 from .base import DatadiffDialect
 
 

data_diff/databases/clickhouse.py

@@ -1,4 +1,4 @@
-from data_diff.sqeleton.databases import clickhouse
+from sqeleton.databases import clickhouse
 from .base import DatadiffDialect
 
 

data_diff/databases/databricks.py

@@ -1,4 +1,4 @@
-from data_diff.sqeleton.databases import databricks
+from sqeleton.databases import databricks
 from .base import DatadiffDialect
 
 

data_diff/databases/duckdb.py

@@ -1,4 +1,4 @@
-from data_diff.sqeleton.databases import duckdb
+from sqeleton.databases import duckdb
 from .base import DatadiffDialect
 
 

data_diff/databases/mysql.py

@@ -1,4 +1,4 @@
-from data_diff.sqeleton.databases import mysql
+from sqeleton.databases import mysql
 from .base import DatadiffDialect