Skip to content

Fix regression in DAO.prototype.save #528

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

Merged
bajtos merged 3 commits into from
Mar 23, 2015
Merged

Fix regression in DAO.prototype.save #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7dc6fa
Fix regression in prototype.save
Mar 23, 2015
1fbaf4e
Improve test failure messages
Mar 23, 2015
35b5495
test: fix test failure in MySQL connector
Mar 23, 2015
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
2 changes: 1 addition & 1 deletion lib/dao.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1587,7 +1587,7 @@ DataAccessObject.prototype.save = function (options, cb) {
inst.trigger('save', function (saveDone) {
inst.trigger('update', function (updateDone) {
data = removeUndefined(data);
inst._adapter().save(modelName, inst.constructor._forDB(data), function (err, data, result) {
inst._adapter().save(modelName, inst.constructor._forDB(data), function (err, unusedData, result) {
if (err) {
return cb(err, inst);
}
Expand Down
23 changes: 12 additions & 11 deletions test/manipulation.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ describe('manipulation', function () {
p.name = 'Hans';
p.save(function (err) {
should.not.exist(err);
p.name.should.equal('Hans');
Person.findOne(function (err, p) {
should.not.exist(err);
p.name.should.equal('Hans');
Expand Down Expand Up @@ -616,7 +617,7 @@ describe('manipulation', function () {

it('should allow save() of the created instance', function(done) {
Person.updateOrCreate(
{ id: 'new-id', name: 'a-name' },
{ id: 999 /* a new id */, name: 'a-name' },
function(err, inst) {
if (err) return done(err);
inst.save(done);
Expand Down Expand Up @@ -768,9 +769,9 @@ describe('manipulation', function () {
});

it('should only delete instances that satisfy the where condition', function (done) {
Person.deleteAll({name: 'John'}, function (err, data) {
Person.deleteAll({name: 'John'}, function (err, result) {
if (err) return done(err);
data.count.should.equal(1);
result.should.have.property('count', 1);
Person.find({where: {name: 'John'}}, function (err, data) {
if (err) return done(err);
data.should.have.length(0);
Expand All @@ -784,9 +785,9 @@ describe('manipulation', function () {
});

it('should report zero deleted instances', function (done) {
Person.deleteAll({name: 'does-not-match'}, function (err, data) {
Person.deleteAll({name: 'does-not-match'}, function (err, result) {
if (err) return done(err);
data.count.should.equal(0);
result.should.have.property('count', 0);
Person.count(function(err, count) {
if (err) return done(err);
count.should.equal(2);
Expand All @@ -796,9 +797,9 @@ describe('manipulation', function () {
});

it('should delete all instances when "where" is not provided', function(done) {
Person.deleteAll(function (err, data) {
Person.deleteAll(function (err, result) {
if (err) return done(err);
data.count.should.equal(2);
result.should.have.property('count', 2);
Person.count(function(err, count) {
if (err) return done(err);
count.should.equal(0);
Expand Down Expand Up @@ -1038,7 +1039,7 @@ describe('manipulation', function () {
Person.update({name: 'Harry Hoe'}, {name: 'Marta Moe'}, function(err,
results) {
should.not.exist(err);
results.count.should.equal(0);
results.should.have.property('count', 0);
Person.find({where: {name: 'Harry Hoe'}}, function(err, people) {
should.not.exist(err);
people.should.be.empty;
Expand All @@ -1052,7 +1053,7 @@ describe('manipulation', function () {
Person.update({name: 'Brett Boe'}, {name: 'Harry Hoe'}, function(err,
results) {
should.not.exist(err);
results.count.should.equal(1);
results.should.have.property('count', 1);
Person.find({where: {age: 19}}, function(err, people) {
should.not.exist(err);
people.should.have.length(1);
Expand All @@ -1066,7 +1067,7 @@ describe('manipulation', function () {
function(done) {
Person.update({name: 'Harry Hoe'}, function(err, results) {
should.not.exist(err);
results.count.should.equal(5);
results.should.have.property('count', 5);
Person.find({where: {name: 'Brett Boe'}}, function(err, people) {
should.not.exist(err);
people.should.be.empty;
Expand All @@ -1084,7 +1085,7 @@ describe('manipulation', function () {
Person.update({name: 'Brett Boe'}, {name: undefined, gender: 'male'},
function(err, results) {
should.not.exist(err);
results.count.should.equal(1);
results.should.have.property('count', 1)
Person.find({where: {name: 'Brett Boe'}}, function(err, people) {
should.not.exist(err);
people.should.have.length(1);
Expand Down