lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change manyOrNone to any

Browse source
This commit is contained in:
Josh Harvey 2016-06-05 14:10:46 +03:00
parent c32120209d
commit 01d46f1fe7
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/postgresql_interface.js
View file

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