mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix "too many SQL variables" deleting collection with >1000 items

Browse source
This commit is contained in:
Dan Stillman 2019-05-15 15:47:37 -04:00
parent 2af63c0f33
commit 6ba6028ed0
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
chrome/content/zotero/xpcom/data/collection.js
View file

@ -630,19 +630,25 @@ Zotero.Collection.prototype._eraseData = Zotero.Promise.coroutine(function* (env
}.bind(this));
}
var placeholders = collections.map(() => '?').join();
// Remove item associations for all descendent collections
yield Zotero.DB.queryAsync('DELETE FROM collectionItems WHERE collectionID IN '
+ '(' + placeholders + ')', collections);
// Remove parent definitions first for FK check
yield Zotero.DB.queryAsync('UPDATE collections SET parentCollectionID=NULL '
+ 'WHERE parentCollectionID IN (' + placeholders + ')', collections);
// And delete all descendent collections
yield Zotero.DB.queryAsync ('DELETE FROM collections WHERE collectionID IN '
+ '(' + placeholders + ')', collections);
yield Zotero.Utilities.Internal.forEachChunkAsync(
collections,
Zotero.DB.MAX_BOUND_PARAMETERS,
async function (chunk) {
var placeholders = chunk.map(() => '?').join();
// Remove item associations for all descendent collections
await Zotero.DB.queryAsync('DELETE FROM collectionItems WHERE collectionID IN '
+ '(' + placeholders + ')', chunk);
// Remove parent definitions first for FK check
await Zotero.DB.queryAsync('UPDATE collections SET parentCollectionID=NULL '
+ 'WHERE parentCollectionID IN (' + placeholders + ')', chunk);
// And delete all descendent collections
await Zotero.DB.queryAsync('DELETE FROM collections WHERE collectionID IN '
+ '(' + placeholders + ')', chunk);
}
);
env.deletedObjectIDs = collections;