improved error handling of seeders

db-migrate · May 9, 2015 · 731e2c6 · 731e2c6
1 parent c46192c
commit 731e2c6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/api.js b/api.js
@@ -43,6 +43,7 @@ function dbmigrate(isModule, callback) {
   internals.dbm = dbm;
   global.dbm = dbm; //deprecated
   internals.migrationOptions = { dbmigrate: internals.dbm };
+  internals.seederOptions = { dbmigrate: internals.dbm };
 }
 
 

diff --git a/lib/seeder.js b/lib/seeder.js
@@ -118,14 +118,20 @@ Seeder.prototype = {
           log.verbose('preparing to run up seeder:', seeder.name);
 
           return self.driver.startMigration()
-          .catch(callback)
           .then(function() {
+            var setup = seeder.setup();
+
+            if(typeof(setup) === 'function')
+              setup(internals.seederOptions);
+
             return (Promise.promisify(self.up.bind(self)))(seeder.up.bind(seeder));
-          });
+          })
+          .then(self.driver.endMigration.bind(self.driver));
+        })
+        .catch(function(e) {
+
+          throw e;
         })
-        .catch(callback)
-        .then(self.driver.endMigration.bind(self.driver))
-        .catch(callback)
         .nodeify(callback);
 
       });
@@ -150,15 +156,21 @@ Seeder.prototype = {
         log.verbose('preparing to run down seeder:', seeder.name);
 
         return self.driver.startMigration()
-          .catch(callback)
           .then(function() {
+
+            var setup = seeder.setup();
+
+            if(typeof(setup) === 'function')
+              setup(internals.seederOptions);
+
             return (Promise.promisify(self.down.bind(self)))(seeder.down.bind(seeder));
-          });
+          })
+          .then(self.driver.endMigration.bind(self.driver));
 
       })
-      .catch(callback)
-      .then(self.driver.endMigration.bind(self.driver))
-      .catch(callback)
+      .catch(function(e) {
+        throw e;
+      })
       .nodeify(callback);
     });
   }