From 1f643c1baae4dbca49277b23c49b4929006b2d37 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 2 Jun 2015 03:28:46 -0400
Subject: [PATCH] Fix skipNotifier option with DataObject::erase()

---
 .../content/zotero/xpcom/data/collection.js   |  2 +-
 chrome/content/zotero/xpcom/data/item.js      |  8 +++-
 chrome/content/zotero/xpcom/search.js         |  2 +-
 test/tests/dataObjectTest.js                  | 38 +++++++++++++++++++
 4 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/chrome/content/zotero/xpcom/data/collection.js b/chrome/content/zotero/xpcom/data/collection.js
index 8137e24eb..912c29026 100644
--- a/chrome/content/zotero/xpcom/data/collection.js
+++ b/chrome/content/zotero/xpcom/data/collection.js
@@ -611,7 +611,7 @@ Zotero.Collection.prototype._eraseData = Zotero.Promise.coroutine(function* (env
 	this.ObjectsClass.unload(collections);
 	//return Zotero.Collections.reloadAll();
 	
-	if (!env.skipNotifier) {
+	if (!env.options.skipNotifier) {
 		Zotero.Notifier.queue('delete', 'collection', collections, notifierData);
 	}
 });
diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js
index 6c93a1836..9fc4eddbd 100644
--- a/chrome/content/zotero/xpcom/data/item.js
+++ b/chrome/content/zotero/xpcom/data/item.js
@@ -3762,7 +3762,11 @@ Zotero.Item.prototype._eraseData = Zotero.Promise.coroutine(function* (env) {
 		let toDelete = yield Zotero.DB.columnQueryAsync(sql, [this.id]);
 		for (let i=0; i<toDelete.length; i++) {
 			let obj = yield this.ObjectsClass.getAsync(toDelete[i]);
-			yield obj.erase();
+			// Copy all options other than 'tx', which would cause a deadlock
+			let options = {};
+			Object.assign(options, env.options);
+			delete options.tx;
+			yield obj.erase(options);
 		}
 	}
 	
@@ -3788,7 +3792,7 @@ Zotero.Item.prototype._erasePreCommit = Zotero.Promise.coroutine(function* (env)
 	
 	this.ObjectsClass.unload(this.id);
 	
-	if (!env.skipNotifier) {
+	if (!env.options.skipNotifier) {
 		Zotero.Notifier.queue('delete', 'item', this.id, env.deletedItemNotifierData);
 	}
 	
diff --git a/chrome/content/zotero/xpcom/search.js b/chrome/content/zotero/xpcom/search.js
index d19b8ae2a..9774b21a3 100644
--- a/chrome/content/zotero/xpcom/search.js
+++ b/chrome/content/zotero/xpcom/search.js
@@ -232,7 +232,7 @@ Zotero.Search.prototype._eraseData = Zotero.Promise.coroutine(function* (env) {
 	var sql = "DELETE FROM savedSearches WHERE savedSearchID=?";
 	yield Zotero.DB.queryAsync(sql, this.id);
 	
-	if (!env.skipNotifier) {
+	if (!env.options.skipNotifier) {
 		Zotero.Notifier.queue('delete', 'search', this.id, notifierData);
 	}
 });
diff --git a/test/tests/dataObjectTest.js b/test/tests/dataObjectTest.js
index e970c301a..37dd779c2 100644
--- a/test/tests/dataObjectTest.js
+++ b/test/tests/dataObjectTest.js
@@ -126,6 +126,44 @@ describe("Zotero.DataObject", function() {
 		})
 	})
 	
+	describe("#erase()", function () {
+		it("shouldn't trigger notifier if skipNotifier is passed", function* () {
+			let observerIDs = [];
+			let promises = [];
+			for (let type of types) {
+				let obj = yield createDataObject(type);
+				// For items, test automatic child item deletion
+				if (type == 'item') {
+					yield createDataObject(type, { itemType: 'note', parentID: obj.id });
+				}
+				
+				let deferred = Zotero.Promise.defer();
+				promises.push(deferred.promise);
+				observerIDs.push(Zotero.Notifier.registerObserver(
+					{
+						notify: function (event) {
+							if (event == 'delete') {
+								deferred.reject("Notifier called for erase on " + type);
+							}
+						}
+					},
+					type,
+					'test'
+				));
+				yield obj.eraseTx({
+					skipNotifier: true
+				});
+			}
+			yield Zotero.Promise.all(promises)
+				// Give notifier time to trigger
+				.timeout(100).catch(Zotero.Promise.TimeoutError, (e) => {})
+			
+			for (let id of observerIDs) {
+				Zotero.Notifier.unregisterObserver(id);
+			}
+		})
+	})
+	
 	describe("#updateVersion()", function() {
 		it("should update the object version", function* () {
 			for (let type of types) {