Skip to content

You pull too often, see the time line of this pull. Amazing. #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dream-wlmcode wants to merge 2 commits into
base: master
Choose a base branch
from
Open

You pull too often, see the time line of this pull. Amazing. #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
520042d
Update step-file-reader.js
maxulyanov May 30, 2018
bff7374
Update migration.js
maxulyanov Jan 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/migration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down Expand Up @@ -174,4 +175,4 @@ Migration.prototype.migrate = function(doneCb) {
}.bind(this));
};

module.exports = Migration;
module.exports = Migration;
3 changes: 2 additions & 1 deletion src/steps/step-file-reader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -27,4 +28,4 @@ StepFile.prototype.getStep = function(){
return new Step(merge(obj, {checksum : this.checksum}));
}

module.exports = StepFile;
module.exports = StepFile;