Refactor (removed 35 lines)

Author: erezsh

data_diff/diff_tables.py

@@ -91,7 +91,9 @@ def __post_init__(self):
  raise ValueError(f"Error: min_key expected to be smaller than max_key! ({self.min_key} >= {self.max_key})")
 
  if self.min_update is not None and self.max_update is not None and self.min_update >= self.max_update:
- raise ValueError(f"Error: min_update expected to be smaller than max_update! ({self.min_update} >= {self.max_update})")
+ raise ValueError(
+ f"Error: min_update expected to be smaller than max_update! ({self.min_update} >= {self.max_update})"
+ )
 
  @property
  def _update_column(self):

tests/test_database_types.py

@@ -8,6 +8,8 @@
 from datetime import datetime, timedelta, timezone
 import logging
 from decimal import Decimal
+from itertools import islice, accumulate, repeat, chain
+
 from parameterized import parameterized
 
 from data_diff import databases as db
@@ -290,54 +292,28 @@ def __init__(self, max):
  self.max = max
 
  def __iter__(self):
- iter = DateTimeFaker(self.max)
- iter.prev = datetime(2000, 1, 1, 0, 0, 0, 0)
- iter.i = 0
- return iter
+ initial = datetime(2000, 1, 1, 0, 0, 0, 0)
+ step = timedelta(seconds=3, microseconds=571)
+ return islice(chain(self.MANUAL_FAKES, accumulate(repeat(step), initial=initial)), self.max)
 
  def __len__(self):
  return self.max
 
- def __next__(self) -> datetime:
- if self.i < len(self.MANUAL_FAKES):
- fake = self.MANUAL_FAKES[self.i]
- self.i += 1
- return fake
- elif self.i < self.max:
- self.prev = self.prev + timedelta(seconds=3, microseconds=571)
- self.i += 1
- return self.prev
- else:
- raise StopIteration
-
 
 class IntFaker:
- MANUAL_FAKES = [127, -3, -9, 37, 15, 127]
+ MANUAL_FAKES = [127, -3, -9, 37, 15, 0]
 
  def __init__(self, max):
  self.max = max
 
  def __iter__(self):
- iter = IntFaker(self.max)
- iter.prev = -128
- iter.i = 0
- return iter
+ initial = -128
+ step = 1
+ return islice(chain(self.MANUAL_FAKES, accumulate(repeat(step), initial=initial)), self.max)
 
  def __len__(self):
  return self.max
 
- def __next__(self) -> int:
- if self.i < len(self.MANUAL_FAKES):
- fake = self.MANUAL_FAKES[self.i]
- self.i += 1
- return fake
- elif self.i < self.max:
- self.prev += 1
- self.i += 1
- return self.prev
- else:
- raise StopIteration
-
 
 class FloatFaker:
  MANUAL_FAKES = [
@@ -363,26 +339,13 @@ def __init__(self, max):
  self.max = max
 
  def __iter__(self):
- iter = FloatFaker(self.max)
- iter.prev = -10.0001
- iter.i = 0
- return iter
+ initial = -10.0001
+ step = 0.00571
+ return islice(chain(self.MANUAL_FAKES, accumulate(repeat(step), initial=initial)), self.max)
 
  def __len__(self):
  return self.max
 
- def __next__(self) -> float:
- if self.i < len(self.MANUAL_FAKES):
- fake = self.MANUAL_FAKES[self.i]
- self.i += 1
- return fake
- elif self.i < self.max:
- self.prev += 0.00571
- self.i += 1
- return self.prev
- else:
- raise StopIteration
-
 
 class UUID_Faker:
  def __init__(self, max):

tests/test_diff_tables.py

@@ -6,7 +6,7 @@
 import preql
 import arrow # comes with preql
 
-from data_diff.databases import connect
+from data_diff.databases.connect import connect
 from data_diff.diff_tables import TableDiffer, TableSegment, split_space
 from data_diff import databases as db
 from data_diff.utils import ArithAlphanumeric