allow skipping order as well

Author: sakulstra

src/migration.js

@@ -30,14 +30,16 @@ var validate = function(cb) {
         this.db.collection(this.collection).find({}, {}, {order : 1}).toArray(function(err, docs){
             assert.equal(err, null);
             var _steps = utilities.arrayToObject(this.steps, 'id');
-            docs.forEach(function(dbStep, index){
+            docs.forEach(function(dbStep){
+                var index = this.steps.findIndex(function(step){return step.id === dbStep.id});
                 if(this.steps[index]){
-                    this.steps[index].status = statuses.skipped;   
-                    console.log(this.options);
-                    if(!this.options.ignoreOrder && (!_steps[dbStep.id] || (dbStep.order && dbStep.order != _steps[dbStep.id].order))){
+                    this.steps[index].status = statuses.skipped;
+                    if(!_steps[dbStep.id] || (dbStep.order !== undefined && dbStep.order != _steps[dbStep.id].order)){
+                        if(this.options.ignoreOrder) return;
                         this.steps[index].status = statuses.error;
                         cb("[" + dbStep.id + "] was already migrated on [" + dbStep.date + "] in a different order. Database order[" + dbStep.order + "] - Current migration on this order[" + this.steps[index].id + "]");
-                    }else if(!this.options.ignoreChecksum && (dbStep.checksum != this.steps[index].checksum)){
+                    }else if(dbStep.checksum != _steps[dbStep.id].checksum){
+                        if(this.options.ignoreChecksum) return;
                         this.steps[index].status = statuses.error;
                         cb("[" + dbStep.id + "] was already migrated on [" + dbStep.date + "] in a different version. Database version[" + dbStep.checksum + "] - Current version[" + this.steps[index].checksum + "]");
                     }

test/migration-itest.js

@@ -151,7 +151,6 @@ describe('Mongration.Migration', function() {
             migration2.add(files[1]); // "edited": same id, different content
 
             migration2.migrate(function(err, result) {
-                console.log(err,result);
                 should.not.exist(err);
                 result.should.be.an('array');
                 result.should.have.lengthOf(1);
@@ -162,6 +161,29 @@ describe('Mongration.Migration', function() {
         });
     });
 
+    it('does rollback if order changed', function(done) {
+        var migration = new Migration(config);
+        var files = getFiles('migrations/migration-order');
+        migration.add(files[1]);
+
+        migration.migrate(function(err, result) {
+            should.not.exist(err);
+            var migration2 = new Migration(config);
+            migration2.add([files[0], files[1]]);
+
+            migration2.migrate(function(err, result) {
+                err.should.match(/already migrated(.*)in a different order/)
+                result.should.be.an('array');
+                result.should.have.lengthOf(2);
+                result.should.have.deep.property('[0].id', '1');
+                result.should.have.deep.property('[0].status', 'not-run');
+                result.should.have.deep.property('[1].id', '2');
+                result.should.have.deep.property('[1].status', 'error');
+                done();
+            });
+        });
+    });
+
     it('does skip if order changed', function(done) {
         var migration = new Migration(config);
         var files = getFiles('migrations/migration-order');
@@ -172,11 +194,12 @@ describe('Mongration.Migration', function() {
             migration2.add([files[0], files[1]]);
 
             migration2.migrate(function(err, result) {
-                console.log(err, result);
                 should.not.exist(err);
                 result.should.be.an('array');
                 result.should.have.lengthOf(2);
-                result.should.have.deep.property('[1].id', '1');
+                result.should.have.deep.property('[0].id', '1');
+                result.should.have.deep.property('[1].id', '2');
+                result.should.have.deep.property('[0].status', 'ok');
                 result.should.have.deep.property('[1].status', 'skipped');
                 done();
             });