Merge pull request #728 from freezy/execmerge

Make explicit migrations possible.

lib/migration.js

 var moment         = require("moment")
 var moment         = require("moment")
+  , path           = require("path")
   , Utils          = require("./utils")
   , Utils          = require("./utils")
   , DataTypes      = require("./data-types")
   , DataTypes      = require("./data-types")
   , QueryInterface = require("./query-interface")
   , QueryInterface = require("./query-interface")
 
 
 module.exports = (function() {
 module.exports = (function() {
-  var Migration = function(migrator, path) {
+  var Migration = function(migrator, p) {
     this.migrator       = migrator
     this.migrator       = migrator
-    this.path           = path
-    this.filename       = Utils._.last(this.path.split('/'))
+    this.path           = path.normalize(p)
+    this.filename       = Utils._.last(this.path.split(path.sep))
 
 
     var parsed          = Migration.parseFilename(this.filename)
     var parsed          = Migration.parseFilename(this.filename)
 
 

lib/migrator.js

@@ -177,6 +177,56 @@ module.exports = (function() {
     }).run()
     }).run()
   }
   }
 
 
+  /**
+   * Explicitly executes one or multiple migrations.
+   *
+   * @param filename {String|Array} Absolute filename(s) of the migrations script
+   * @param options  {Object}       Can contain three functions, before, after and success, which are executed before
+   *                                or after each migration respectively, with one parameter, the migration.
+   */
+  Migrator.prototype.exec = function(filename, options) {
+
+    var self = this;
+    return new Utils.CustomEventEmitter(function(emitter) {
+      var chainer = new Utils.QueryChainer;
+      var addMigration = function(filename) {
+        self.options.logging('Adding migration script at ' + filename)
+        var migration = new Migration(self, filename)
+        chainer.add(migration, 'execute', [{ method: 'up' }], {
+          before: function(migration) {
+            if (options && Utils._.isFunction(options.before)) {
+              options.before.call(self, migration);
+            }
+          },
+          after: function(migration) {
+            if (options && Utils._.isFunction(options.after)) {
+              options.after.call(self, migration);
+            }
+          },
+          success: function(migration, callback) {
+            if (options && Utils._.isFunction(options.success)) {
+              options.success.call(self, migration);
+            }
+            callback();
+          }
+        })
+      }
+
+      if (Utils._.isArray(filename)) {
+        Utils._.each(filename, function(f) {
+          addMigration(f);
+        })
+      } else {
+        addMigration(filename);
+      }
+
+      chainer
+        .runSerially({ skipOnError: true })
+        .success(function() { emitter.emit('success', null) })
+        .error(function(err) { emitter.emit('error', err) })
+    }).run()
+  }
+
   // private
   // private
 
 
   var getLastMigrationFromDatabase = function() {
   var getLastMigrationFromDatabase = function() {