diff --git a/lib/postgresql_interface.js b/lib/postgresql_interface.js index f374ff40..dec69b93 100644 --- a/lib/postgresql_interface.js +++ b/lib/postgresql_interface.js @@ -203,7 +203,7 @@ exports.fetchPhoneTxs = function fetchPhoneTxs (phone, dispenseTimeout) { const values = [phone, false, dispenseTimeout] - return db.manyOrNone(sql, values) + return db.any(sql, values) .then(rows => normalizeTxs(rows)) } @@ -264,12 +264,12 @@ exports.machineEvent = function machineEvent (rec) { exports.devices = function devices () { const sql = 'SELECT fingerprint, name FROM devices WHERE authorized=$1' - return db.manyOrNone(sql, [true]) + return db.any(sql, [true]) } exports.machineEvents = function machineEvents () { const sql = 'SELECT *, (EXTRACT(EPOCH FROM (now() - created))) * 1000 AS age FROM machine_events' - return db.manyOrNone(sql, []) + return db.any(sql, []) } function singleQuotify (item) { return '\'' + item + '\'' } @@ -282,7 +282,7 @@ exports.fetchOpenTxs = function fetchOpenTxs (statuses, age) { 'WHERE ((EXTRACT(EPOCH FROM (now() - created))) * 1000)<$1 ' + 'AND status IN ' + _statuses - return db.manyOrNone(sql, [age]) + return db.any(sql, [age]) .then(rows => normalizeTxs(rows)) } @@ -295,7 +295,7 @@ exports.fetchUnnotifiedTxs = function fetchUnnotifiedTxs (age, waitPeriod) { AND status IN ('instant', 'confirmed') AND (redeem=$4 OR ((EXTRACT(EPOCH FROM (now() - created))) * 1000)>$5)` - return db.manyOrNone(sql, [age, false, false, true, waitPeriod]) + return db.any(sql, [age, false, false, true, waitPeriod]) .then(rows => normalizeTxs(rows)) } @@ -454,7 +454,7 @@ exports.fetchLiveHD = function fetchLiveHD () { const values = ['confirmed', false, LIVE_SWEEP_TTL] - return db.manyOrNone(sql, values) + return db.any(sql, values) } exports.fetchOldHD = function fetchLiveHD () { @@ -463,7 +463,7 @@ exports.fetchOldHD = function fetchLiveHD () { order by last_checked limit 10` - return db.manyOrNone(sql) + return db.any(sql) } exports.markSwept = function markSwept (sessionId) {