Fix the aftermath of refactoring: incompletely removed mixins

Sergey Vasilyev · Sergey Vasilyev · commit c36ff0ab464b · 2023-10-02T16:54:12.000+02:00
diff --git a/data_diff/databases/base.py b/data_diff/databases/base.py
@@ -240,7 +240,6 @@ class BaseDialect(abc.ABC):
     SUPPORTS_PRIMARY_KEY = False
     SUPPORTS_INDEXES = False
     TYPE_CLASSES: Dict[str, type] = {}
-    MIXINS = frozenset()
 
     PLACEHOLDER_TABLE = None  # Used for Oracle
 
@@ -785,17 +784,6 @@ def _convert_db_precision_to_digits(self, p: int) -> int:
         # See: https://en.wikipedia.org/wiki/Single-precision_floating-point_format
         return math.floor(math.log(2**p, 10))
 
-    @classmethod
-    def load_mixins(cls, *abstract_mixins) -> Self:
-        "Load a list of mixins that implement the given abstract mixins"
-        mixins = {m for m in cls.MIXINS if issubclass(m, abstract_mixins)}
-
-        class _DialectWithMixins(cls, *mixins, *abstract_mixins):
-            pass
-
-        _DialectWithMixins.__name__ = cls.__name__
-        return _DialectWithMixins()
-
     @property
     @abstractmethod
     def name(self) -> str:
diff --git a/data_diff/databases/bigquery.py b/data_diff/databases/bigquery.py
@@ -161,7 +161,6 @@ class Dialect(
     }
     TYPE_ARRAY_RE = re.compile(r"ARRAY<(.+)>")
     TYPE_STRUCT_RE = re.compile(r"STRUCT<(.+)>")
-    MIXINS = {Mixin_Schema, Mixin_MD5, Mixin_NormalizeValue, Mixin_TimeTravel, Mixin_RandomSample}
 
     def random(self) -> str:
         return "RAND()"
diff --git a/data_diff/databases/clickhouse.py b/data_diff/databases/clickhouse.py
@@ -125,7 +125,6 @@ class Dialect(BaseDialect, Mixin_MD5, Mixin_NormalizeValue, AbstractMixin_MD5, A
         "DateTime64": Timestamp,
         "Bool": Boolean,
     }
-    MIXINS = {Mixin_MD5, Mixin_NormalizeValue, Mixin_RandomSample}
 
     def quote(self, s: str) -> str:
         return f'"{s}"'
diff --git a/data_diff/databases/databricks.py b/data_diff/databases/databricks.py
@@ -79,7 +79,6 @@ class Dialect(BaseDialect, Mixin_MD5, Mixin_NormalizeValue, AbstractMixin_MD5, A
         # Boolean
         "BOOLEAN": Boolean,
     }
-    MIXINS = {Mixin_MD5, Mixin_NormalizeValue, Mixin_RandomSample}
 
     def quote(self, s: str):
         return f"`{s}`"
diff --git a/data_diff/databases/duckdb.py b/data_diff/databases/duckdb.py
@@ -75,7 +75,6 @@ class Dialect(
     ROUNDS_ON_PREC_LOSS = False
     SUPPORTS_PRIMARY_KEY = True
     SUPPORTS_INDEXES = True
-    MIXINS = {Mixin_Schema, Mixin_MD5, Mixin_NormalizeValue, Mixin_RandomSample}
 
     TYPE_CLASSES = {
         # Timestamps
diff --git a/data_diff/databases/mssql.py b/data_diff/databases/mssql.py
@@ -106,8 +106,6 @@ class Dialect(
         "json": JSON,
     }
 
-    MIXINS = {Mixin_Schema, Mixin_NormalizeValue, Mixin_RandomSample}
-
     def quote(self, s: str):
         return f"[{s}]"
 
diff --git a/data_diff/databases/mysql.py b/data_diff/databases/mysql.py
@@ -99,7 +99,6 @@ class Dialect(
         # Boolean
         "boolean": Boolean,
     }
-    MIXINS = {Mixin_Schema, Mixin_MD5, Mixin_NormalizeValue, Mixin_RandomSample}
 
     def quote(self, s: str):
         return f"`{s}`"
diff --git a/data_diff/databases/oracle.py b/data_diff/databases/oracle.py
@@ -104,7 +104,6 @@ class Dialect(
     }
     ROUNDS_ON_PREC_LOSS = True
     PLACEHOLDER_TABLE = "DUAL"
-    MIXINS = {Mixin_Schema, Mixin_MD5, Mixin_NormalizeValue, Mixin_RandomSample}
 
     def quote(self, s: str):
         return f'"{s}"'
diff --git a/data_diff/databases/postgresql.py b/data_diff/databases/postgresql.py
@@ -67,7 +67,6 @@ class PostgresqlDialect(
     ROUNDS_ON_PREC_LOSS = True
     SUPPORTS_PRIMARY_KEY = True
     SUPPORTS_INDEXES = True
-    MIXINS = {Mixin_Schema, Mixin_MD5, Mixin_NormalizeValue, Mixin_RandomSample}
 
     TYPE_CLASSES = {
         # Timestamps
diff --git a/data_diff/databases/presto.py b/data_diff/databases/presto.py
@@ -96,7 +96,6 @@ class Dialect(
         # Boolean
         "boolean": Boolean,
     }
-    MIXINS = {Mixin_Schema, Mixin_MD5, Mixin_NormalizeValue, Mixin_RandomSample}
 
     def explain_as_text(self, query: str) -> str:
         return f"EXPLAIN (FORMAT TEXT) {query}"
diff --git a/data_diff/databases/snowflake.py b/data_diff/databases/snowflake.py
@@ -123,7 +123,6 @@ class Dialect(
         # Boolean
         "BOOLEAN": Boolean,
     }
-    MIXINS = {Mixin_Schema, Mixin_MD5, Mixin_NormalizeValue, Mixin_TimeTravel, Mixin_RandomSample}
 
     def explain_as_text(self, query: str) -> str:
         return f"EXPLAIN USING TEXT {query}"
diff --git a/data_diff/databases/vertica.py b/data_diff/databases/vertica.py
@@ -98,7 +98,6 @@ class Dialect(
         # Boolean
         "boolean": Boolean,
     }
-    MIXINS = {Mixin_Schema, Mixin_MD5, Mixin_NormalizeValue, Mixin_RandomSample}
 
     def quote(self, s: str):
         return f'"{s}"'
diff --git a/tests/test_database.py b/tests/test_database.py
@@ -45,11 +45,7 @@ def test_connect_to_db(self):
 
 class TestMD5(unittest.TestCase):
     def test_md5_as_int(self):
-        class MD5Dialect(dbs.mysql.Dialect, dbs.mysql.Mixin_MD5):
-            pass
-
         self.mysql = connect(TEST_MYSQL_CONN_STRING)
-        self.mysql.dialect = MD5Dialect()
 
         str = "hello world"
         query_fragment = self.mysql.dialect.md5_as_int("'{0}'".format(str))
diff --git a/tests/test_query.py b/tests/test_query.py
@@ -66,9 +66,6 @@ def set_timezone_to_utc(self) -> str:
     def optimizer_hints(self, s: str):
         return f"/*+ {s} */ "
 
-    def load_mixins(self):
-        raise NotImplementedError()
-
     parse_type = NotImplemented
 
 

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,6 @@ class Dialect(`
`161`	`161`	`}`
`162`	`162`	`TYPE_ARRAY_RE = re.compile(r"ARRAY<(.+)>")`
`163`	`163`	`TYPE_STRUCT_RE = re.compile(r"STRUCT<(.+)>")`
`164`		`- MIXINS = {Mixin_Schema, Mixin_MD5, Mixin_NormalizeValue, Mixin_TimeTravel, Mixin_RandomSample}`
`165`	`164`
`166`	`165`	`def random(self) -> str:`
`167`	`166`	`return "RAND()"`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,6 @@ class Dialect(BaseDialect, Mixin_MD5, Mixin_NormalizeValue, AbstractMixin_MD5, A`
`125`	`125`	`"DateTime64": Timestamp,`
`126`	`126`	`"Bool": Boolean,`
`127`	`127`	`}`
`128`		`- MIXINS = {Mixin_MD5, Mixin_NormalizeValue, Mixin_RandomSample}`
`129`	`128`
`130`	`129`	`def quote(self, s: str) -> str:`
`131`	`130`	`return f'"{s}"'`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,6 @@ class Dialect(BaseDialect, Mixin_MD5, Mixin_NormalizeValue, AbstractMixin_MD5, A`
`79`	`79`	`# Boolean`
`80`	`80`	`"BOOLEAN": Boolean,`
`81`	`81`	`}`
`82`		`- MIXINS = {Mixin_MD5, Mixin_NormalizeValue, Mixin_RandomSample}`
`83`	`82`
`84`	`83`	`def quote(self, s: str):`
`85`	`84`	return f"`{s}`"
Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,6 @@ class Dialect(`
`106`	`106`	`"json": JSON,`
`107`	`107`	`}`
`108`	`108`
`109`		`- MIXINS = {Mixin_Schema, Mixin_NormalizeValue, Mixin_RandomSample}`
`110`		`-`
`111`	`109`	`def quote(self, s: str):`
`112`	`110`	`return f"[{s}]"`
`113`	`111`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,6 @@ class Dialect(`
`99`	`99`	`# Boolean`
`100`	`100`	`"boolean": Boolean,`
`101`	`101`	`}`
`102`		`- MIXINS = {Mixin_Schema, Mixin_MD5, Mixin_NormalizeValue, Mixin_RandomSample}`
`103`	`102`
`104`	`103`	`def quote(self, s: str):`
`105`	`104`	return f"`{s}`"
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,6 @@ class Dialect(`
`104`	`104`	`}`
`105`	`105`	`ROUNDS_ON_PREC_LOSS = True`
`106`	`106`	`PLACEHOLDER_TABLE = "DUAL"`
`107`		`- MIXINS = {Mixin_Schema, Mixin_MD5, Mixin_NormalizeValue, Mixin_RandomSample}`
`108`	`107`
`109`	`108`	`def quote(self, s: str):`
`110`	`109`	`return f'"{s}"'`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,6 @@ class Dialect(`
`96`	`96`	`# Boolean`
`97`	`97`	`"boolean": Boolean,`
`98`	`98`	`}`
`99`		`- MIXINS = {Mixin_Schema, Mixin_MD5, Mixin_NormalizeValue, Mixin_RandomSample}`
`100`	`99`
`101`	`100`	`def explain_as_text(self, query: str) -> str:`
`102`	`101`	`return f"EXPLAIN (FORMAT TEXT) {query}"`