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

Return empty array instead of FALSE for async DB query methods

Browse source 
The exception is valueQueryAsync(), which continues to return FALSE if
there's no result.

Note that this is different from the synchronous query methods.
This commit is contained in:
Dan Stillman 2013-08-12 16:28:22 -04:00
parent d05c5094c7
commit a29f8ea852
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
chrome/content/zotero/xpcom/db.js
View file

@ -842,10 +842,9 @@ Zotero.DBConnection.prototype.executeTransaction = function (func) {
/** /**
* @param {String} sql SQL statement to run * @param {String} sql SQL statement to run
* @param {Array|String|Integer} [params] SQL parameters to bind * @param {Array|String|Integer} [params] SQL parameters to bind
* @return {Promise} A Q promise for either an array of rows or FALSE if none. * @return {Promise|Array} A Q promise for an array of rows. The individual
* The individual rows are Proxy objects that return * rows are Proxy objects that return values from the
* values from the underlying mozIStorageRows based * underlying mozIStorageRows based on column names.
* on column names.
*/ */
Zotero.DBConnection.prototype.queryAsync = function (sql, params) { Zotero.DBConnection.prototype.queryAsync = function (sql, params) {
let conn; let conn;
@ -913,7 +912,7 @@ Zotero.DBConnection.prototype.queryAsync = function (sql, params) {
/** /**
* @param {String} sql SQL statement to run * @param {String} sql SQL statement to run
* @param {Array|String|Integer} [params] SQL parameters to bind * @param {Array|String|Integer} [params] SQL parameters to bind
* @return {Promise} A Q promise for either the value or FALSE if no rows * @return {Promise:Array|Boolean} A Q promise for either the value or FALSE if no result
*/ */
Zotero.DBConnection.prototype.valueQueryAsync = function (sql, params) { Zotero.DBConnection.prototype.valueQueryAsync = function (sql, params) {
let self = this; let self = this;
@ -953,13 +952,13 @@ Zotero.DBConnection.prototype.valueQueryAsync = function (sql, params) {
* *
* @param {String} sql SQL statement to run * @param {String} sql SQL statement to run
* @param {Array|String|Integer} [params] SQL parameters to bind * @param {Array|String|Integer} [params] SQL parameters to bind
* @return {Promise} A Q promise for either the row or FALSE if no rows * @return {Promise:Array} A Q promise for an array of row values
*/ */
Zotero.DBConnection.prototype.rowQueryAsync = function (sql, params) { Zotero.DBConnection.prototype.rowQueryAsync = function (sql, params) {
let self = this; let self = this;
return this.queryAsync(sql, params) return this.queryAsync(sql, params)
.then(function (rows) { .then(function (rows) {
return rows.length ? rows[0] : false; return rows.length ? rows[0] : [];
}); });
}; };
@ -967,7 +966,7 @@ Zotero.DBConnection.prototype.rowQueryAsync = function (sql, params) {
/** /**
* @param {String} sql SQL statement to run * @param {String} sql SQL statement to run
* @param {Array|String|Integer} [params] SQL parameters to bind * @param {Array|String|Integer} [params] SQL parameters to bind
* @return {Promise} A Q promise for either the column or FALSE if no rows * @return {Promise:Array} A Q promise for an array of values in the column
*/ */
Zotero.DBConnection.prototype.columnQueryAsync = function (sql, params) { Zotero.DBConnection.prototype.columnQueryAsync = function (sql, params) {
let conn; let conn;
@ -988,9 +987,6 @@ Zotero.DBConnection.prototype.columnQueryAsync = function (sql, params) {
return conn.executeCached(sql, params); return conn.executeCached(sql, params);
}) })
.then(function (rows) { .then(function (rows) {
if (!rows.length) {
return false;
}
var column = []; var column = [];
for (let i=0, len=rows.length; i<len; i++) { for (let i=0, len=rows.length; i<len; i++) {
column.push(self._getTypedValue(rows[i], 0)); column.push(self._getTypedValue(rows[i], 0));