Fix error message bubbling up on seed error (#3248)

src/seed/Seeder.js

@@ -124,25 +124,26 @@ Seeder.prototype._waterfallBatch = function(seeds) {
     seed = require(name);
 
     // Run each seed file.
-    current = current
-      .then(() => seed.seed(knex, Promise))
-      .then(() => {
-        log.push(name);
-      })
-      .catch((originalError) => {
-        const error = new Error(
-          `Error while executing "${name}" seed: ${originalError.message}`
-        );
-        error.original = originalError;
-        error.stack =
-          error.stack
-            .split('\n')
-            .slice(0, 2)
-            .join('\n') +
-          '\n' +
-          originalError.stack;
-        throw error;
-      });
+    current = current.then(() =>
+      // Nesting promise to prevent bubbling up of error on catch
+      Promise.resolve()
+        .then(() => seed.seed(knex, Promise))
+        .then(() => log.push(name))
+        .catch((originalError) => {
+          const error = new Error(
+            `Error while executing "${name}" seed: ${originalError.message}`
+          );
+          error.original = originalError;
+          error.stack =
+            error.stack
+              .split('\n')
+              .slice(0, 2)
+              .join('\n') +
+            '\n' +
+            originalError.stack;
+          throw error;
+        })
+    );
   });
 
   return current.thenReturn([log]);

test/unit/seed/seeder.js

@@ -7,7 +7,7 @@ var knex = require('../../../knex');
 
 describe('Seeder.loadExtensions', function() {
   var config = {
-    client: 'pg',
+    client: 'postgres',
     connection: {
       user: 'postgres',
       password: '',
@@ -67,3 +67,32 @@ describe('Seeder.loadExtensions', function() {
       });
   });
 });
+
+describe('Seeder._waterfallBatch', function() {
+  var config = {
+    client: 'postgres',
+    connection: {
+      user: 'postgres',
+      password: '',
+      host: '127.0.0.1',
+      database: 'knex_test',
+    },
+    seeds: {
+      directory: 'test/unit/seed/test',
+    },
+  };
+  var seeder;
+
+  beforeEach(function() {
+    seeder = knex(config).seed;
+  });
+
+  it('should throw an error with correct file name', (done) => {
+    seeder._waterfallBatch(['1-first.js', '2-second.js']).catch((error) => {
+      expect(error.message).to.match(
+        /^Error while executing "(\/\w+)+\/1-first\.js" seed: throwing in first file$/
+      );
+      done();
+    });
+  });
+});

test/unit/seed/test/1-first.js

@@ -0,0 +1,5 @@
+'use strict';
+
+exports.seed = function() {
+  throw new Error('throwing in first file');
+};

test/unit/seed/test/2-second.js

@@ -0,0 +1,5 @@
+'use strict';
+
+exports.seed = function() {
+  return 'doing nothing in second file';
+};