Skip to content

Commit 50bac04

Browse files
authored
Merge pull request datafold#485 from datafold/embed-sqeleton
Embed sqeleton with git history preserved
2 parents 7a5769d + c87d93c commit 50bac04

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+6842
-410
lines changed

data_diff/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from typing import Sequence, Tuple, Iterator, Optional, Union
22

3-
from sqeleton.abcs import DbTime, DbPath
3+
from data_diff.sqeleton.abcs import DbTime, DbPath
44

55
from .tracking import disable_tracking
66
from .databases import connect

data_diff/__main__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import rich
1111
import click
1212

13-
from sqeleton.schema import create_schema
14-
from sqeleton.queries.api import current_timestamp
13+
from data_diff.sqeleton.schema import create_schema
14+
from data_diff.sqeleton.queries.api import current_timestamp
1515

1616
from .dbt import dbt_diff
1717
from .utils import eval_name_template, remove_password_from_url, safezip, match_like

data_diff/databases/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from sqeleton.databases import MD5_HEXDIGITS, CHECKSUM_HEXDIGITS, QueryError, ConnectError
1+
from data_diff.sqeleton.databases import MD5_HEXDIGITS, CHECKSUM_HEXDIGITS, QueryError, ConnectError
22

33
from .postgresql import PostgreSQL
44
from .mysql import MySQL

data_diff/databases/_connect.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import logging
22

3-
from sqeleton.databases import Connect
3+
from data_diff.sqeleton.databases import Connect
44

55
from .postgresql import PostgreSQL
66
from .mysql import MySQL

data_diff/databases/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from sqeleton.abcs.mixins import AbstractMixin_MD5, AbstractMixin_NormalizeValue
1+
from data_diff.sqeleton.abcs.mixins import AbstractMixin_MD5, AbstractMixin_NormalizeValue
22

33

44
class DatadiffDialect(AbstractMixin_MD5, AbstractMixin_NormalizeValue):

data_diff/databases/bigquery.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from sqeleton.databases import bigquery
1+
from data_diff.sqeleton.databases import bigquery
22
from .base import DatadiffDialect
33

44

data_diff/databases/clickhouse.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from sqeleton.databases import clickhouse
1+
from data_diff.sqeleton.databases import clickhouse
22
from .base import DatadiffDialect
33

44

data_diff/databases/databricks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from sqeleton.databases import databricks
1+
from data_diff.sqeleton.databases import databricks
22
from .base import DatadiffDialect
33

44

data_diff/databases/duckdb.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from sqeleton.databases import duckdb
1+
from data_diff.sqeleton.databases import duckdb
22
from .base import DatadiffDialect
33

44

data_diff/databases/mysql.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from sqeleton.databases import mysql
1+
from data_diff.sqeleton.databases import mysql
22
from .base import DatadiffDialect
33

44

data_diff/databases/oracle.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from sqeleton.databases import oracle
1+
from data_diff.sqeleton.databases import oracle
22
from .base import DatadiffDialect
33

44

data_diff/databases/postgresql.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from sqeleton.databases import postgresql as pg
1+
from data_diff.sqeleton.databases import postgresql as pg
22
from .base import DatadiffDialect
33

44

data_diff/databases/presto.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from sqeleton.databases import presto
1+
from data_diff.sqeleton.databases import presto
22
from .base import DatadiffDialect
33

44

data_diff/databases/redshift.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from sqeleton.databases import redshift
1+
from data_diff.sqeleton.databases import redshift
22
from .base import DatadiffDialect
33

44

data_diff/databases/snowflake.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from sqeleton.databases import snowflake
1+
from data_diff.sqeleton.databases import snowflake
22
from .base import DatadiffDialect
33

44

data_diff/databases/trino.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from sqeleton.databases import trino
1+
from data_diff.sqeleton.databases import trino
22
from .base import DatadiffDialect
33

44

data_diff/databases/vertica.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from sqeleton.databases import vertica
1+
from data_diff.sqeleton.databases import vertica
22
from .base import DatadiffDialect
33

44

data_diff/diff_tables.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from .thread_utils import ThreadedYielder
1919
from .table_segment import TableSegment, create_mesh_from_points
2020
from .tracking import create_end_event_json, create_start_event_json, send_event_json, is_tracking_enabled
21-
from sqeleton.abcs import IKey
21+
from data_diff.sqeleton.abcs import IKey
2222

2323
logger = getLogger(__name__)
2424

data_diff/hashdiff_tables.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from runtype import dataclass
99

10-
from sqeleton.abcs import ColType_UUID, NumericType, PrecisionType, StringType, Boolean
10+
from data_diff.sqeleton.abcs import ColType_UUID, NumericType, PrecisionType, StringType, Boolean
1111

1212
from .info_tree import InfoTree
1313
from .utils import safezip

data_diff/joindiff_tables.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
from runtype import dataclass
1212

13-
from sqeleton.databases import Database, MySQL, BigQuery, Presto, Oracle, Snowflake, DbPath
14-
from sqeleton.abcs import NumericType
15-
from sqeleton.queries import (
13+
from data_diff.sqeleton.databases import Database, MySQL, BigQuery, Presto, Oracle, Snowflake, DbPath
14+
from data_diff.sqeleton.abcs import NumericType
15+
from data_diff.sqeleton.queries import (
1616
table,
1717
sum_,
1818
min_,
@@ -27,8 +27,8 @@
2727
this,
2828
Compiler,
2929
)
30-
from sqeleton.queries.ast_classes import Concat, Count, Expr, Random, TablePath, Code, ITable
31-
from sqeleton.queries.extras import NormalizeAsString
30+
from data_diff.sqeleton.queries.ast_classes import Concat, Count, Expr, Random, TablePath, Code, ITable
31+
from data_diff.sqeleton.queries.extras import NormalizeAsString
3232

3333
from .info_tree import InfoTree
3434

data_diff/query_utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
from contextlib import suppress
44

5-
from sqeleton.databases import DbPath, QueryError, Oracle
6-
from sqeleton.queries import table, commit, Expr
5+
from data_diff.sqeleton.databases import DbPath, QueryError, Oracle
6+
from data_diff.sqeleton.queries import table, commit, Expr
77

88

99
def _drop_table_oracle(name: DbPath):

data_diff/sqeleton/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
from .databases import connect
2+
from .queries import table, this, SKIP, code

data_diff/sqeleton/__main__.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import click
2+
from .repl import repl as repl_main
3+
4+
5+
@click.group(no_args_is_help=True)
6+
def main():
7+
pass
8+
9+
10+
@main.command(no_args_is_help=True)
11+
@click.argument("database", required=True)
12+
def repl(database):
13+
return repl_main(database)
14+
15+
16+
if __name__ == "__main__":
17+
main()

data_diff/sqeleton/abcs/__init__.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
from .database_types import (
2+
AbstractDatabase,
3+
AbstractDialect,
4+
DbKey,
5+
DbPath,
6+
DbTime,
7+
IKey,
8+
ColType_UUID,
9+
NumericType,
10+
PrecisionType,
11+
StringType,
12+
Boolean,
13+
)
14+
from .compiler import AbstractCompiler, Compilable

data_diff/sqeleton/abcs/compiler.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
from typing import Any, Dict
2+
from abc import ABC, abstractmethod
3+
4+
5+
class AbstractCompiler(ABC):
6+
@abstractmethod
7+
def compile(self, elem: Any, params: Dict[str, Any] = None) -> str:
8+
...
9+
10+
11+
class Compilable(ABC):
12+
# TODO generic syntax, so we can write Compilable[T] for expressions returning a value of type T
13+
@abstractmethod
14+
def compile(self, c: AbstractCompiler) -> str:
15+
...

0 commit comments

Comments
 (0)