Update dependencies

Run `npm update` and `npm audit fix`

Fix formatting

Author: ThomWright

.gitattributes

@@ -0,0 +1 @@
+package-lock.json -diff

package-lock.json

@@ -50,23 +50,22 @@
     }
   },
   "dependencies": {
-    "pg": "^8.5.1",
+    "pg": "^8.6.0",
     "sql-template-strings": "^2.2.2"
   },
   "devDependencies": {
-    "@types/bluebird": "^3.5.33",
-    "@types/node": "^10.17.51",
-    "@types/pg": "^7.14.8",
-    "@types/sinon": "^9.0.10",
+    "@types/node": "^10.17.60",
+    "@types/pg": "^7.14.11",
+    "@types/sinon": "^9.0.11",
     "ava": "^3.15.0",
     "fit-commit-js": "^0.3.2",
     "husky": "^3.1.0",
-    "prettier": "^2.2.1",
-    "sinon": "^9.2.3",
+    "prettier": "^2.3.1",
+    "sinon": "^9.2.4",
     "ts-node": "^8.10.2",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0",
-    "typescript": "^3.9.7",
+    "typescript": "^3.9.10",
     "typescript-tslint-plugin": "^0.5.5"
   }
 }

package.json

@@ -23,38 +23,36 @@ const insertMigration = async (
   return client.query(sql)
 }
 
-export const runMigration = (
-  migrationTableName: string,
-  client: BasicPgClient,
-  log: Logger = noop,
-) => async (migration: Migration) => {
-  const inTransaction =
-    migration.sql.includes("-- postgres-migrations disable-transaction") ===
-    false
-
-  log(`Running migration in transaction: ${inTransaction}`)
+export const runMigration =
+  (migrationTableName: string, client: BasicPgClient, log: Logger = noop) =>
+  async (migration: Migration) => {
+    const inTransaction =
+      migration.sql.includes("-- postgres-migrations disable-transaction") ===
+      false
 
-  const begin = inTransaction ? () => client.query("START TRANSACTION") : noop
+    log(`Running migration in transaction: ${inTransaction}`)
 
-  const end = inTransaction ? () => client.query("COMMIT") : noop
+    const begin = inTransaction ? () => client.query("START TRANSACTION") : noop
 
-  const cleanup = inTransaction ? () => client.query("ROLLBACK") : noop
+    const end = inTransaction ? () => client.query("COMMIT") : noop
 
-  try {
-    await begin()
-    await client.query(migration.sql)
-    await insertMigration(migrationTableName, client, migration, log)
-    await end()
+    const cleanup = inTransaction ? () => client.query("ROLLBACK") : noop
 
-    return migration
-  } catch (err) {
     try {
-      await cleanup()
-    } catch {
-      //
+      await begin()
+      await client.query(migration.sql)
+      await insertMigration(migrationTableName, client, migration, log)
+      await end()
+
+      return migration
+    } catch (err) {
+      try {
+        await cleanup()
+      } catch {
+        //
+      }
+      throw new Error(
+        `An error occurred running '${migration.name}'. Rolled back this migration. No further migrations were run. Reason: ${err.message}`,
+      )
     }
-    throw new Error(
-      `An error occurred running '${migration.name}'. Rolled back this migration. No further migrations were run. Reason: ${err.message}`,
-    )
   }
-}