diff --git a/src/migration.js b/src/migration.js index 988e9d3..09442f1 100644 --- a/src/migration.js +++ b/src/migration.js @@ -37,10 +37,11 @@ var validate = function(cb) { if(!_steps[dbStep.id] || (dbStep.order && dbStep.order != _steps[dbStep.id].order)){ 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(dbStep.checksum != this.steps[index].checksum){ - 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 + "]"); } +// else if(dbStep.checksum != this.steps[index].checksum){ +// 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 + "]"); +// } } }.bind(this)); @@ -174,4 +175,4 @@ Migration.prototype.migrate = function(doneCb) { }.bind(this)); }; -module.exports = Migration; \ No newline at end of file +module.exports = Migration; diff --git a/src/steps/step-file-reader.js b/src/steps/step-file-reader.js index 1a14876..d38ed80 100644 --- a/src/steps/step-file-reader.js +++ b/src/steps/step-file-reader.js @@ -17,6 +17,7 @@ function StepFile(path){ StepFile.prototype.read = function(){ this.content = fs.readFileSync(this.path, {encoding : 'utf8'}); + this.content = this.content.replace(/[\r]/g, ''); this.checksum = md5(this.content); return this; @@ -27,4 +28,4 @@ StepFile.prototype.getStep = function(){ return new Step(merge(obj, {checksum : this.checksum})); } -module.exports = StepFile; \ No newline at end of file +module.exports = StepFile;