Chore: refactor to use new schema changing queries

lib/admin/accounts.js

@@ -18,7 +18,7 @@ function loadSchemas () {
 const schemas = loadSchemas()
 
 function fetchAccounts () {
-  return db.oneOrNone('select data from user_config where type=$1 and schema_version=$2', ['accounts', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
+  return db.$oneOrNone('select data from user_config where type=$1 and schema_version=$2', ['accounts', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
     .then(row => {
     // Hard code this for now
       const accounts = [{
@@ -31,7 +31,7 @@ function fetchAccounts () {
 
       return row
         ? Promise.resolve(row.data.accounts)
-        : db.none('insert into user_config (type, data, valid) values ($1, $2, $3)', ['accounts', {accounts}, true])
+        : db.$none('insert into user_config (type, data, valid) values ($1, $2, $3)', ['accounts', {accounts}, true])
           .then(fetchAccounts)
     })
 }
@@ -102,7 +102,7 @@ function getAccount (accountCode) {
 }
 
 function save (accounts) {
-  return db.none('update user_config set data=$1 where type=$2 and schema_version=$3', [{accounts: accounts}, 'accounts', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
+  return db.$none('update user_config set data=$1 where type=$2 and schema_version=$3', [{accounts: accounts}, 'accounts', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
 }
 
 function updateAccounts (newAccount, accounts) {

lib/admin/config-validate.js

@@ -104,7 +104,7 @@ function getGroupField (group, fieldCode) {
 // Note: We can't use machine-loader because it relies on settings-loader,
 // which relies on this
 function getMachines () {
-  return db.any('select device_id from devices')
+  return db.$any('select device_id from devices')
 }
 
 function fetchMachines () {

lib/admin/config.js

@@ -22,7 +22,7 @@ function fetchConfig () {
   const sql = `select data from user_config where type=$1 and schema_version=$2
   order by id desc limit 1`
 
-  return db.oneOrNone(sql, ['config', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
+  return db.$oneOrNone(sql, ['config', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
     .then(row => row ? row.data.config : [])
 }
 

lib/admin/login.js

@@ -7,7 +7,7 @@ function generateOTP (name) {
 
   const sql = 'insert into one_time_passes (token, name) values ($1, $2)'
 
-  return db.none(sql, [otp, name])
+  return db.$none(sql, [otp, name])
     .then(() => otp)
 }
 
@@ -16,7 +16,7 @@ function validateOTP (otp) {
     where token=$1
     returning name, created < now() - interval '1 hour' as expired`
 
-  return db.one(sql, [otp])
+  return db.$one(sql, [otp])
     .then(r => ({success: !r.expired, expired: r.expired, name: r.name}))
     .catch(() => ({success: false, expired: false}))
 }
@@ -29,7 +29,7 @@ function register (otp) {
       const token = crypto.randomBytes(32).toString('hex')
       const sql = 'insert into user_tokens (token, name) values ($1, $2)'
 
-      return db.none(sql, [token, r.name])
+      return db.$none(sql, [token, r.name])
         .then(() => ({success: true, token: token}))
     })
     .catch(() => ({success: false, expired: false}))
@@ -38,7 +38,7 @@ function register (otp) {
 function authenticate (token) {
   const sql = 'select token from user_tokens where token=$1'
 
-  return db.one(sql, [token]).then(() => true).catch(() => false)
+  return db.$one(sql, [token]).then(() => true).catch(() => false)
 }
 
 module.exports = {

lib/admin/pairing.js

@@ -25,7 +25,7 @@ function totem (hostname, name) {
       const buf = Buffer.concat([caHash, token, Buffer.from(hostname)])
       const sql = 'insert into pairing_tokens (token, name) values ($1, $3), ($2, $3)'
 
-      return db.none(sql, [hexToken, caHexToken, name])
+      return db.$none(sql, [hexToken, caHexToken, name])
         .then(() => bsAlpha.encode(buf))
     })
 }

lib/admin/server.js

@@ -20,7 +20,7 @@ function machinesLastPing () {
   from machine_events
   group by device_id`
 
-  return Promise.all([machineLoader.getMachineNames(), db.any(sql)])
+  return Promise.all([machineLoader.getMachineNames(), db.$any(sql)])
     .then(([machines, events]) => {
       if (machines.length === 0) return 'No paired machines'
 
@@ -52,7 +52,7 @@ function status () {
   order by created desc
   limit 1`
 
-  return Promise.all([checkWasConfigured(), db.oneOrNone(sql, ['ping']), machinesLastPing()])
+  return Promise.all([checkWasConfigured(), db.$oneOrNone(sql, ['ping']), machinesLastPing()])
     .then(([wasConfigured, statusRow, machineStatus]) => {
       const age = statusRow && moment.duration(statusRow.age, 'seconds')
       const up = statusRow ? statusRow.age < CONSIDERED_UP_SECS : false

lib/admin/settings-loader.js

@@ -70,7 +70,7 @@ function loadConfig (versionId) {
   where id=$1 and type=$2 and schema_version=$3
   and valid`
 
-  return db.one(sql, [versionId, 'config', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
+  return db.$one(sql, [versionId, 'config', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
     .then(row => row.data.config)
     .then(configValidate.validate)
     .catch(err => {
@@ -92,7 +92,7 @@ function loadLatestConfig (filterSchemaVersion = true) {
   order by id desc
   limit 1`
 
-  return db.one(sql, ['config', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
+  return db.$one(sql, ['config', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
     .then(row => row.data.config)
     .then(configValidate.validate)
     .catch(err => {
@@ -113,7 +113,7 @@ function loadRecentConfig () {
   order by id desc
   limit 1`
 
-  return db.one(sql, ['config', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
+  return db.$one(sql, ['config', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
     .then(row => row.data.config)
 }
 
@@ -121,7 +121,7 @@ function loadAccounts (filterSchemaVersion = true) {
   const toFields = fieldArr => _.fromPairs(_.map(r => [r.code, r.value], fieldArr))
   const toPairs = r => [r.code, toFields(r.fields)]
 
-  return db.oneOrNone(`select data from user_config where type=$1 ${filterSchemaVersion ? 'and schema_version=$2' : ''}`, ['accounts', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
+  return db.$oneOrNone(`select data from user_config where type=$1 ${filterSchemaVersion ? 'and schema_version=$2' : ''}`, ['accounts', configValidate.SETTINGS_LOADER_SCHEMA_VERSION])
     .then(function (data) {
       if (!data) return {}
       return _.fromPairs(_.map(toPairs, data.data.accounts))
@@ -136,8 +136,8 @@ function save (config) {
   const sql = 'insert into user_config (type, data, valid) values ($1, $2, $3)'
 
   return configValidate.validate(config)
-    .then(() => db.none(sql, ['config', {config}, true]))
-    .catch(() => db.none(sql, ['config', {config}, false]))
+    .then(() => db.$none(sql, ['config', {config}, true]))
+    .catch(() => db.$none(sql, ['config', {config}, false]))
 }
 
 function configAddField (scope, fieldCode, fieldType, fieldClass, value) {

lib/admin/transactions.js

@@ -37,7 +37,7 @@ function batch () {
   from cash_out_txs
   order by created desc limit $1`
 
-  return Promise.all([db.any(cashInSql, [cashInTx.PENDING_INTERVAL, NUM_RESULTS]), db.any(cashOutSql, [NUM_RESULTS, REDEEMABLE_AGE])])
+  return Promise.all([db.$any(cashInSql, [cashInTx.PENDING_INTERVAL, NUM_RESULTS]), db.$any(cashOutSql, [NUM_RESULTS, REDEEMABLE_AGE])])
     .then(packager)
 }
 
@@ -57,8 +57,8 @@ function single (txId) {
   where id=$1`
 
   return Promise.all([
-    db.oneOrNone(cashInSql, [cashInTx.PENDING_INTERVAL, txId]),
-    db.oneOrNone(cashOutSql, [txId, REDEEMABLE_AGE])
+    db.$oneOrNone(cashInSql, [cashInTx.PENDING_INTERVAL, txId]),
+    db.$oneOrNone(cashOutSql, [txId, REDEEMABLE_AGE])
   ])
     .then(packager)
     .then(_.head)