From 0320b08b054c3ab2b39fb46a30a8542520b5e9d9 Mon Sep 17 00:00:00 2001
From: Aurimas Vinckevicius <aurimas.dev@gmail.com>
Date: Wed, 16 Sep 2015 17:48:37 -0500
Subject: [PATCH] Do not return lastInsertRowID for INSERT, REPLACE, and CREATE
 Unreliable for async queries

---
 chrome/content/zotero/xpcom/db.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/chrome/content/zotero/xpcom/db.js b/chrome/content/zotero/xpcom/db.js
index 6221b23a6c..4e6b5451b6 100644
--- a/chrome/content/zotero/xpcom/db.js
+++ b/chrome/content/zotero/xpcom/db.js
@@ -673,15 +673,9 @@ Zotero.DBConnection.prototype.queryAsync = function (sql, params, options) {
 			return rows;
 		}
 		else {
-			if (op == 'insert' || op == 'replace') {
-				return conn.lastInsertRowID;
-			}
-			else if (op == 'create') {
-				return true;
-			}
-			else {
-				return conn.affectedRows;
-			}
+			// lastInsertRowID is unreliable for async queries, so we don't bother
+			// returning it for SELECT and REPLACE queries
+			return;
 		}
 	})
 	.catch(function (e) {