DB Lib

db.test.js

@@ -3,29 +3,29 @@ const { db } = require('db')
 const { delay } = require('utils/promise')
 
 test('parallel sub transactions', async t => {
-  await db.query(`
+  await db.sql`
     DROP TABLE IF EXISTS test_tx;
     CREATE TABLE test_tx (
       id SERIAL PRIMARY KEY,
       "desc" TEXT
     )
-  `)
+  `
 
   async function runQueries (tx) {
     for (const x of [1, 2, 3, 4, 5]) {
-      await tx.query('INSERT INTO test_tx ("desc") VALUES ($1)', [`query ${x}`])
+      await tx.sql`INSERT INTO test_tx ("desc") VALUES (${`query ${x}`})`
       await delay(100)
     }
   }
 
   async function runSubTx (tx) {
     await tx.tx(async tx => {
-      await tx.query('INSERT INTO test_tx ("desc") VALUES (\'back-rolled\')')
+      await tx.sql`INSERT INTO test_tx ("desc") VALUES ('back-rolled')`
       await delay(2.5e3)
       // eslint-disable-next-line promise/catch-or-return
-      delay(100).then(() => tx.query('INSERT INTO test_tx ("desc") VALUES (\'leaked out\')')) // a bug-like case
+      delay(100).then(() => tx.sql`INSERT INTO test_tx ("desc") VALUES ('leaked out')'`) // a bug-like case
       .catch(e => t.ok(e)) // a bug-like case
-      await tx.query('SOMETHING WRONG')
+      await tx.sql`SOMETHING WRONG`
     }).catch(console.log)
   }
 
@@ -36,7 +36,7 @@ test('parallel sub transactions', async t => {
     ])
   })
 
-  const rows = await db.query('SELECT "desc" FROM test_tx')
+  const rows = await db.sql`SELECT "desc" FROM test_tx`
 
   t.deepEqual(rows, [
     { desc: 'query 1' },

db/cli.js

@@ -1,45 +1,31 @@
 // should only be ran through package.json scripts
 
-const argv = require('mri')(process.argv.slice(2), {
-  boolean: true,
-  stopEarly: true,
-})
-const migratio = require('migratio')
-
-const { pgpDB: db, sql, pgp } = require('db')
-
-const command = argv._[0]
+const fs = require('fs')
+const { migrate } = require('postgres-migrations')
+const { db } = require('db')
 
-async function run () {
+async function run (command) {
   switch (command) {
-    case 'up':
-    case 'down':
-    case 'current':
-      return migratio[command]({
-        directory: 'db/migration',
-        tableName: 'migration',
-        verbose: true,
-        revision: argv.r,
-        db,
-      })
+    case 'migrate':
+      return db.task(t => migrate({ client: t.pgClient }, 'db/migration'))
     case 'drop':
-      return db.query('DROP SCHEMA IF EXISTS public CASCADE; CREATE SCHEMA public;')
-    case 'seed':
-      return db.tx(t => {
-        return t.query(sql('seed'))
-      })
+      return db.sql`DROP SCHEMA IF EXISTS public CASCADE; CREATE SCHEMA public;`
+    case 'seed': {
+      const text = fs.readFileSync('db/seed.sql', 'utf8')
+      return db.tx(t => t.query({ text }))
+    }
     default:
       throw new Error(`"${command}" is not a valid migration command`)
   }
 }
 
-run()
+run(...process.argv.slice(2))
 .then(() => {
-  pgp.end()
+  db.pgPool.end()
   return process.exit(0)
 })
 .catch(e => {
   console.error(e)
-  pgp.end()
+  db.pgPool.end()
   return process.exit(1)
 })

db/index.js

@@ -1,47 +1,25 @@
-const pgp = require('pg-promise')({
-  // error (_err, e) { console.log('------\n', e.query) },
-  // query (e) { console.log('------\n', e.query) },
-})
-
+const pg = require('pg')
+const { Database, Sql, sql, format } = require('hrid')
 const error = require('error')
-const { wrapDatabase } = require('utils/pgp-wrappers')
-
-/// PG stuff
 
-// https://github.com/brianc/node-pg-types/issues/50
-const DATE_OID = 1082
-pgp.pg.types.setTypeParser(DATE_OID, v => v)
+// Don't store DB dates in Date!
+pg.types.setTypeParser(1082, v => v)
 
-/// DB stuff
-
-const pgpDB = pgp(process.env.DATABASE_URL)
+const pgPool = new pg.Pool({
+  connectionString: process.env.DATABASE_URL,
+})
 
-const db = wrapDatabase(pgpDB, {
-  queryErrorHandler: e => {
+const db = new Database(pgPool, {
+  queryErrorHandler: (e, query) => {
+    // console.log('------\n', query)
     throw error('db.query', e)
   },
+  debug: process.env.NODE_ENV !== 'production',
 })
 
-/// sql(file)
-
-const queryFiles = new Map()
-
-function sql (filename) {
-  if (!queryFiles.has(filename) || process.env.NODE_ENV === 'development') {
-    queryFiles.set(filename, new pgp.QueryFile(`${filename}.sql`, {
-      compress: process.env.NODE_ENV === 'production',
-      debug: process.env.NODE_ENV === 'development',
-    }))
-  }
-
-  return queryFiles.get(filename)
-}
-
 module.exports = {
   db,
-  pgpDB,
-  helper: pgp.helpers,
-  pgp,
+  Sql,
   sql,
-  util: pgp.utils,
+  format,
 }

dev-docs/loaders.md

@@ -34,11 +34,11 @@ const productRepo = require('repo/product')
 // ... map, ...
 
 async function list ({ limit = 10, includeUsers = false }) {
-  const orders = await db.any(`
+  const orders = await db.sql`
     SELECT *
     FROM "order"
-    LIMIT $[limit]
-  `, {limit})
+    LIMIT ${limit}
+  `
   .then(map)
 
   const loadUserWithRoles = async userId => {
@@ -177,12 +177,12 @@ const loadByUserId = loader.all({
 const { byKeyed } = require('utils/data')
 
 const loadFullName = loader((db, lockingClause) => async userIds => {
-  const rows = await db.any(`
+  const rows = await db.sql`
     SELECT id, (first_name || ' ' || last_name) as "fullName"
     FROM "user"
-    WHERE id IN ($1:csv)
-    ${lockingClause} // <- remember to use the second argument
-  `, [userIds])
+    WHERE id = ANY (${userIds})
+    ${sql.raw(lockingClause)} // <- remember to use the second argument
+  `
 
   return userIds.map(byKeyed(rows, 'id', 'fullName', null))
 }, {

error.js

@@ -1,32 +1,19 @@
 const NestedError = require('nested-error-stacks')
 const _ = require('lodash')
 const assert = require('assert')
-const { QueryFileError, QueryResultError, queryResultErrorCode } = require('pg-promise').errors
 
 const toml = require('utils/toml')
 
 const errors = toml.parseFile('error.toml')
 
 const inProduction = process.env.NODE_ENV === 'production'
 
-// queryResultErrorCode:
-//   noData: int
-//   multiple: int
-//   notEmpty: int
-const queryResultErrorName = _.invert(queryResultErrorCode)
-
 function getCode (ec) {
   const code = _.get(errors, ec)
   if (!code) throw new TypeError(`invalid error const: ${ec}`)
   return code
 }
 
-function checkDBErrorMappingKey (key) {
-  if (!key.includes('_') && !(key in queryResultErrorCode)) {
-    throw new TypeError(`invalid dbErrorHandler mapping key: ${key}`)
-  }
-}
-
 class GenericError extends NestedError {
   constructor (ec, cause, status) {
     super(ec, cause)
@@ -59,17 +46,14 @@ function error (ec, cause, status) {
 
 function dbErrorHandler (mapping = {}) {
   if (!inProduction) {
-    _.keys(mapping).forEach(checkDBErrorMappingKey)
-    _.values(mapping).filter(_.isString).forEach(getCode)
+    _.values(mapping).forEach(getCode)
   }
 
   return err => {
     let cause = err
     while (cause instanceof DatabaseError) cause = cause.nested
 
-    const key = cause instanceof QueryResultError
-      ? queryResultErrorName[cause.code]
-      : cause.constraint
+    const key = cause.constraint
 
     const handle = key && mapping[key]
 
@@ -90,8 +74,6 @@ error.AssertionError = assert.AssertionError
 error.DatabaseError = DatabaseError
 error.GenericError = GenericError
 error.HttpError = HttpError
-error.QueryFileError = QueryFileError
-error.QueryResultError = QueryResultError
 error.ValidationError = ValidationError
 
 module.exports = error

package.json

@@ -14,6 +14,7 @@
     "connection-string": "^3.2.0",
     "crypto-random-string": "^3.2.0",
     "dotenv-safe": "^8.2.0",
+    "hrid": "^0.1.0",
     "joi": "^17.2.1",
     "joi-to-swagger": "^5.0.1",
     "js-yaml": "^3.14.0",
@@ -30,13 +31,11 @@
     "koa-send": "^5.0.0",
     "lodash": "^4.17.21",
     "memo-args": "gist:e941ee28eb4e4072ebbe9d696fdfb7af",
-    "migratio": "^2.0.3",
-    "mri": "^1.1.5",
     "nested-error-stacks": "^2.1.0",
     "nodemailer": "^6.4.16",
     "npm-run-all": "^4.1.5",
-    "pg-promise": "^10.5.2",
-    "queue": "gist:b22ca12fcee4e1d4c3c0f85d43080f92",
+    "pg": "^8.6.0",
+    "postgres-migrations": "^5.1.1",
     "redoc-cli": "^0.9.8",
     "swagger-ui-dist": "^3.25.3"
   },
@@ -63,15 +62,11 @@
     "docs:build:bundle": "run-s docs:build docs:bundle",
     "docs:serve:watch": "redoc-cli serve docs/api/docs.json --watch",
     "ci": "run-s lint coverage",
-    "db:recreate": "run-s db:drop \"db up\"",
-    "db:migrate": "run-s \"db up\"",
-    "db:drop": "run-s \"db drop\"",
-    "db:seed": "run-s \"db seed\"",
     "dev": "NODE_PATH=. node-dev --no-notify index.js",
     "lint": "eslint .",
     "db": "NODE_PATH=. node -r ./env db/cli.js",
     "start": "NODE_PATH=. node index.js",
-    "test": "NODE_ENV=test run-s db:recreate db:seed test:run",
+    "test": "NODE_ENV=test run-s \"db drop\" \"db migrate\" \"db seed\" test:run",
     "test:run": "NODE_PATH=. tape -r ./env '{!(node_modules)/**/*.test.js,./*.test.js}' | tap-difflet",
     "coverage": "nyc --reporter=lcov --reporter=text npm run test"
   }