Merge pull request #10 from smooth-code/various-fixes

Various fixes

Author: gregberge

.travis.yml

@@ -3,8 +3,6 @@ notifications:
   email: false
 services:
   - postgresql
-addons:
-  postgresql: '9.6'
 node_js:
   - 10
   - 12

package.json

@@ -17,33 +17,33 @@
     "knex-scripts": "bin/knex-scripts"
   },
   "dependencies": {
-    "chalk": "^2.4.2",
-    "commander": "^3.0.0",
-    "interpret": "^1.2.0",
+    "chalk": "^3.0.0",
+    "commander": "^5.0.0",
+    "interpret": "^2.0.0",
     "liftoff": "^3.1.0",
-    "minimist": "^1.2.0",
-    "mkdirp": "^0.5.1",
+    "minimist": "^1.2.5",
+    "mkdirp": "^1.0.3",
     "mz": "^2.7.0",
     "tildify": "^2.0.0",
     "tiny-glob": "^0.2.6",
     "v8flags": "^3.1.3"
   },
   "devDependencies": {
-    "@babel/cli": "^7.5.5",
-    "@babel/core": "^7.5.5",
-    "@babel/plugin-proposal-class-properties": "^7.5.5",
-    "@babel/preset-env": "^7.5.5",
-    "babel-eslint": "^10.0.3",
-    "babel-jest": "^24.9.0",
+    "@babel/cli": "^7.8.4",
+    "@babel/core": "^7.9.0",
+    "@babel/plugin-proposal-class-properties": "^7.8.3",
+    "@babel/preset-env": "^7.9.0",
+    "babel-eslint": "^10.1.0",
+    "babel-jest": "^25.2.3",
     "conventional-github-releaser": "^3.1.3",
-    "eslint": "^6.2.2",
-    "eslint-config-airbnb-base": "^14.0.0",
-    "eslint-config-prettier": "^6.1.0",
-    "eslint-plugin-import": "^2.18.2",
-    "jest": "^24.9.0",
-    "knex": "^0.19.2",
-    "pg": "^7.12.1",
-    "prettier": "^1.18.2",
-    "standard-version": "^7.0.0"
+    "eslint": "^6.8.0",
+    "eslint-config-airbnb-base": "^14.1.0",
+    "eslint-config-prettier": "^6.10.1",
+    "eslint-plugin-import": "^2.20.2",
+    "jest": "^25.2.3",
+    "knex": "^0.20.13",
+    "pg": "^7.18.2",
+    "prettier": "^2.0.2",
+    "standard-version": "^7.1.0"
   }
 }

src/load.js

@@ -12,7 +12,10 @@ async function load(options) {
   preventEnv('production', options.env)
 
   const env = getCommandEnv(options)
-  const command = `${getCommand(options, 'psql')} < ${structurePath}`
+  const command = `${getCommand(
+    options,
+    'psql',
+  )} -v ON_ERROR_STOP=1 -f ${structurePath}`
 
   return exec(wrapDockerCommand(options, command), { env })
 }

src/utils.js

@@ -5,7 +5,7 @@ export async function getInsertsFromMigrations(migrationsPath) {
   if (!(await exists(migrationsPath))) return []
   const migrations = await glob('*.js', { cwd: migrationsPath })
   return migrations.map(
-    migration =>
+    (migration) =>
       `INSERT INTO public.knex_migrations(name, batch, migration_time) VALUES ('${migration}', 1, NOW());`,
   )
 }