From 520042de22d0fe3743917f34579a4e0c7ab36a4f Mon Sep 17 00:00:00 2001 From: Max Ulyanov Date: Wed, 30 May 2018 10:19:03 +0300 Subject: [PATCH 1/2] Update step-file-reader.js --- src/steps/step-file-reader.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; From bff7374bead3eb010e12e96dcf0eb8d13a02f821 Mon Sep 17 00:00:00 2001 From: Max Ulyanov Date: Thu, 31 Jan 2019 23:04:04 +0300 Subject: [PATCH 2/2] Update migration.js --- src/migration.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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;