Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

9441: DB-API with sqlite doesn't unlock the table when txn.batch = True

Browse Source
This commit is contained in:
Doug Blank 2016-05-07 13:46:29 -04:00
parent ac0fbecc4b
commit af487de69a
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gramps/gen/db/generic.py
View File

@ -860,11 +860,6 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
""" """
if transaction.batch: if transaction.batch:
self.env.txn_checkpoint() self.env.txn_checkpoint()
# Only build surname list after surname index is surely back
self.build_surname_list()
# FIXME: need a User GUI update callback here:
self.reindex_reference_map(lambda percent: percent)
# Reset callbacks if necessary # Reset callbacks if necessary
if transaction.batch or not len(transaction): if transaction.batch or not len(transaction):
return return

4
gramps/plugins/database/dbapi.py
View File

@ -341,6 +341,10 @@ class DBAPI(DbGeneric):
""" """
Executed after a batch operation. Executed after a batch operation.
""" """
if txn.batch:
self.build_surname_list()
# FIXME: need a User GUI update callback here:
self.reindex_reference_map(lambda percent: percent)
self.dbapi.commit() self.dbapi.commit()
self.transaction = None self.transaction = None
msg = txn.get_description() msg = txn.get_description()