Skip to content
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

Jump to bottom

fix(increment): fix key value broken query #12985

Merged
merged 3 commits into from Nov 20, 2021
Merged

fix(increment): fix key value broken query #12985

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
e0cfb2a
fix(increment): fix key value broken query
bparan Jan 28, 2021
305e706
Merge branch 'main' into key-value-increment-fix
sdepold Nov 19, 2021
40f8845
Merge branch 'main' into key-value-increment-fix
sdepold Nov 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions lib/model.js
View file
Open in desktop
Expand Up @@ -3315,6 +3315,15 @@ class Model {
}
return f;
});
} else if (fields && typeof fields === 'object') {
fields = Object.keys(fields).reduce((rawFields, f) => {
if (this.rawAttributes[f] && this.rawAttributes[f].field && this.rawAttributes[f].field !== f) {
rawFields[this.rawAttributes[f].field] = fields[f];
} else {
rawFields[f] = fields[f];
}
return rawFields;
}, {});
}

this._injectScope(options);
Expand Down
24 changes: 23 additions & 1 deletion test/integration/instance/increment.test.js
View file
Open in desktop
Expand Up @@ -28,6 +28,7 @@ describe(Support.getTestDialectTeaser('Instance'), () => {
touchedAt: { type: DataTypes.DATE, defaultValue: DataTypes.NOW },
aNumber: { type: DataTypes.INTEGER },
bNumber: { type: DataTypes.INTEGER },
cNumber: { type: DataTypes.INTEGER, field: 'CNumberColumn' },
aDate: { type: DataTypes.DATE },

validateTest: {
Expand Down Expand Up @@ -57,7 +58,7 @@ describe(Support.getTestDialectTeaser('Instance'), () => {

describe('increment', () => {
beforeEach(async function() {
await this.User.create({ id: 1, aNumber: 0, bNumber: 0 });
await this.User.create({ id: 1, aNumber: 0, bNumber: 0, cNumber: 0 });
});

if (current.dialect.supports.transactions) {
Expand Down Expand Up @@ -150,6 +151,27 @@ describe(Support.getTestDialectTeaser('Instance'), () => {
expect(user3.bNumber).to.be.equal(2);
});

it('single value should work when field name is different from database column name', async function() {
const user = await this.User.findByPk(1);
await user.increment('cNumber');
const user2 = await this.User.findByPk(1);
expect(user2.cNumber).to.be.equal(1);
});

it('array should work when field name is different from database column name', async function() {
const user = await this.User.findByPk(1);
await user.increment(['cNumber']);
const user2 = await this.User.findByPk(1);
expect(user2.cNumber).to.be.equal(1);
});

it('key value should work when field name is different from database column name', async function() {
const user = await this.User.findByPk(1);
await user.increment({ cNumber: 1 });
const user2 = await this.User.findByPk(1);
expect(user2.cNumber).to.be.equal(1);
});

it('with timestamps set to true', async function() {
const User = this.sequelize.define('IncrementUser', {
aNumber: DataTypes.INTEGER
Expand Down