lib/aiodatalite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5 from mathyba/fix-tests

Browse Source 
Fix failing mass action tests when run multiple times
This commit is contained in:
Ambertide
2021-05-08 18:18:48 +03:00
committed by GitHub
parent 490b5f16a5 db7eda11b3
commit a4b1410a42
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
datalite/mass_actions.py
View File

@@ -65,8 +65,10 @@ def _mass_insert(objects: Union[List[T], Tuple[T]], db_name: str, protect_memory
sql_queries = [] sql_queries = []
first_index: int = 0 first_index: int = 0
table_name = objects[0].__class__.__name__.lower() table_name = objects[0].__class__.__name__.lower()
for obj in objects:
for i, obj in enumerate(objects):
kv_pairs = asdict(obj).items() kv_pairs = asdict(obj).items()
setattr(obj, "obj_id", first_index + i + 1)
sql_queries.append(f"INSERT INTO {table_name}(" + sql_queries.append(f"INSERT INTO {table_name}(" +
f"{', '.join(item[0] for item in kv_pairs)})" + f"{', '.join(item[0] for item in kv_pairs)})" +
f" VALUES ({', '.join(_convert_sql_format(item[1]) for item in kv_pairs)});") f" VALUES ({', '.join(_convert_sql_format(item[1]) for item in kv_pairs)});")
@@ -81,8 +83,6 @@ def _mass_insert(objects: Union[List[T], Tuple[T]], db_name: str, protect_memory
cur.executescript("BEGIN TRANSACTION;\n" + '\n'.join(sql_queries) + '\nEND TRANSACTION;') cur.executescript("BEGIN TRANSACTION;\n" + '\n'.join(sql_queries) + '\nEND TRANSACTION;')
except sql.IntegrityError: except sql.IntegrityError:
raise ConstraintFailedError raise ConstraintFailedError
for i, obj in enumerate(objects):
setattr(obj, "obj_id", first_index + i + 1)
def create_many(objects: Union[List[T], Tuple[T]], protect_memory: bool = True) -> None: def create_many(objects: Union[List[T], Tuple[T]], protect_memory: bool = True) -> None:

13
test/main_tests.py
View File

@@ -199,16 +199,23 @@ class DatabaseMassInsert(unittest.TestCase):
def setUp(self) -> None: def setUp(self) -> None:
self.objs = [MassCommit(f'cat + {i}') for i in range(30)] self.objs = [MassCommit(f'cat + {i}') for i in range(30)]
def testMassCreate(self): def testMassCreate(self):
with connect('other.db') as con:
cur = con.cursor()
cur.execute(f'CREATE TABLE IF NOT EXISTS MASSCOMMIT (obj_id, str_)')
start_tup = fetch_all(MassCommit)
create_many(self.objs, protect_memory=False) create_many(self.objs, protect_memory=False)
_objs = fetch_all(MassCommit) _objs = fetch_all(MassCommit)
self.assertEqual(_objs, tuple(self.objs)) self.assertEqual(_objs, start_tup + tuple(self.objs))
def testMassCopy(self): def testMassCopy(self):
copy_many(self.objs, 'other.db', False)
setattr(MassCommit, 'db_path', 'other.db') setattr(MassCommit, 'db_path', 'other.db')
start_tup = fetch_all(MassCommit)
copy_many(self.objs, 'other.db', False)
tup = fetch_all(MassCommit) tup = fetch_all(MassCommit)
self.assertEqual(tup, tuple(self.objs)) self.assertEqual(tup, start_tup + tuple(self.objs))
def tearDown(self) -> None: def tearDown(self) -> None:
[obj.remove_entry() for obj in self.objs] [obj.remove_entry() for obj in self.objs]