suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Throw an error from queryAsync() if onRow throws an error

Browse Source 
If onRow throws StopIteration, the query will stop gracefully.
This commit is contained in:
Dan Stillman 2016-03-28 17:47:25 -04:00
parent 0c5eacbd0f
commit cebf2a3125
2 changed files with 49 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
chrome/content/zotero/xpcom/db.js
View File

@ -613,6 +613,7 @@ Zotero.DBConnection.prototype.queryAsync = Zotero.Promise.coroutine(function* (s
if (Zotero.Debug.enabled) { if (Zotero.Debug.enabled) {
this.logQuery(sql, params, options); this.logQuery(sql, params, options);
} }
var failed = false;
if (options && options.onRow) { if (options && options.onRow) {
// Errors in onRow don't stop the query unless StopIteration is thrown // Errors in onRow don't stop the query unless StopIteration is thrown
onRow = function (row) { onRow = function (row) {
@ -620,12 +621,15 @@ Zotero.DBConnection.prototype.queryAsync = Zotero.Promise.coroutine(function* (s
options.onRow(row); options.onRow(row);
} }
catch (e) { catch (e) {
// If the onRow throws a StopIteration, stop gracefully
if (e instanceof StopIteration) { if (e instanceof StopIteration) {
Zotero.debug("Query cancelled"); Zotero.debug("Query cancelled", 3);
throw e; }
// Otherwise, mark the promise as rejected, which Sqlite.jsm doesn't do
// on a StopIteration by default
else {
failed = e;
} }
Zotero.debug(e, 1);
Components.utils.reportError(e);
throw StopIteration; throw StopIteration;
} }
} }
@ -637,6 +641,9 @@ Zotero.DBConnection.prototype.queryAsync = Zotero.Promise.coroutine(function* (s
else { else {
rows = yield conn.executeCached(sql, params, onRow); rows = yield conn.executeCached(sql, params, onRow);
} }
if (failed) {
throw failed;
}
// Parse out the SQL command being used // Parse out the SQL command being used
let op = sql.match(/^[^a-z]*[^ ]+/i); let op = sql.match(/^[^a-z]*[^ ]+/i);
if (op) { if (op) {

38
test/tests/dbTest.js
View File

@ -131,6 +131,44 @@ describe("Zotero.DB", function() {
assert.equal(rows[0].a, 1); assert.equal(rows[0].a, 1);
assert.equal(rows[1].a, 2); assert.equal(rows[1].a, 2);
}) })
it("should throw an error if onRow throws an error", function* () {
var i = 0;
var e = Zotero.DB.queryAsync(
"SELECT * FROM " + tmpTable,
false,
{
onRow: function (row) {
if (i > 0) {
throw new Error("Failed");
}
i++;
}
}
);
e = yield getPromiseError(e)
assert.ok(e);
assert.equal(e.message, "Failed");
});
it("should stop gracefully if onRow throws a StopIteration", function* () {
var i = 0;
var rows = [];
yield Zotero.DB.queryAsync(
"SELECT * FROM " + tmpTable,
false,
{
onRow: function (row) {
if (i > 0) {
throw StopIteration;
}
rows.push(row.getResultByIndex(0));
i++;
}
}
);
assert.lengthOf(rows, 1);
});
}) })