Skip to content

public / sequelize

Go to a project

不要怂，就是干，撸起袖子干！

Commit e879460c by Benoit MERIAUX Committed by Sushant
Options

fix(associations): fix foreign key with a targetkey on table without pk or with unique key (#10654)

1 parent 258d8aa0
Inline Side-by-side
Showing with 83 additions and 37 deletions
lib/associations/helpers.js
...@@ -20,7 +20,7 @@ function addForeignKeyConstraints(newAttribute, source, target, options, key) { ...@@ -20,7 +20,7 @@ function addForeignKeyConstraints(newAttribute, source, target, options, key) {
const primaryKeys = Object.keys(source.primaryKeys) const primaryKeys = Object.keys(source.primaryKeys)
.map(primaryKeyAttribute => source.rawAttributes[primaryKeyAttribute].field || primaryKeyAttribute); .map(primaryKeyAttribute => source.rawAttributes[primaryKeyAttribute].field || primaryKeyAttribute);
if (primaryKeys.length === 1) { if (primaryKeys.length === 1 || !primaryKeys.includes(key)) {
if (source._schema) { if (source._schema) {
newAttribute.references = { newAttribute.references = {
model: source.sequelize.getQueryInterface().QueryGenerator.addSchema({ model: source.sequelize.getQueryInterface().QueryGenerator.addSchema({
......
test/integration/associations/belongs-to.test.js
...@@ -803,23 +803,25 @@ describe(Support.getTestDialectTeaser('BelongsTo'), () => { ...@@ -803,23 +803,25 @@ describe(Support.getTestDialectTeaser('BelongsTo'), () => {
}); });
it('should support a non-primary key as the association column on a target without a primary key', function() { it('should support a non-primary key as the association column on a target without a primary key', function() {
const User = this.sequelize.define('User', { username: DataTypes.STRING }); const User = this.sequelize.define('User', { username: { type: DataTypes.STRING, unique: true } });
const Task = this.sequelize.define('Task', { title: DataTypes.STRING }); const Task = this.sequelize.define('Task', { title: DataTypes.STRING });
User.removeAttribute('id'); User.removeAttribute('id');
Task.belongsTo(User, { foreignKey: 'user_name', targetKey: 'username' }); Task.belongsTo(User, { foreignKey: 'user_name', targetKey: 'username' });
return this.sequelize.sync({ force: true }).then(() => { return this.sequelize.sync({ force: true })
return User.create({ username: 'bob' }).then(newUser => { .then(() => User.create({ username: 'bob' }))
return Task.create({ title: 'some task' }).then(newTask => { .then(newUser => Task.create({ title: 'some task' })
return newTask.setUser(newUser).then(() => { .then(newTask => newTask.setUser(newUser)))
return Task.findOne({ where: { title: 'some task' } }).then(foundTask => { .then(() => Task.findOne({ where: { title: 'some task' } }))
return foundTask.getUser().then(foundUser => { .then(foundTask => foundTask.getUser())
expect(foundUser.username).to.equal('bob'); .then(foundUser => expect(foundUser.username).to.equal('bob'))
}); .then(() => this.sequelize.getQueryInterface().getForeignKeyReferencesForTable('Tasks'))
}); .then(foreignKeysDescriptions => {
}); expect(foreignKeysDescriptions[0]).to.includes({
}); referencedColumnName: 'username',
referencedTableName: 'Users',
columnName: 'user_name'
}); });
}); });
}); });
...@@ -831,24 +833,26 @@ describe(Support.getTestDialectTeaser('BelongsTo'), () => { ...@@ -831,24 +833,26 @@ describe(Support.getTestDialectTeaser('BelongsTo'), () => {
field: 'user_name', field: 'user_name',
unique: true unique: true
} }
}), });
Task = this.sequelize.define('Task', { const Task = this.sequelize.define('Task', {
title: DataTypes.STRING title: DataTypes.STRING
}); });
Task.belongsTo(User, { foreignKey: 'user_name', targetKey: 'username' }); Task.belongsTo(User, { foreignKey: 'user_name', targetKey: 'username' });
return this.sequelize.sync({ force: true }).then(() => { return this.sequelize.sync({ force: true })
return User.create({ username: 'bob' }).then(newUser => { .then(() => User.create({ username: 'bob' }))
return Task.create({ title: 'some task' }).then(newTask => { .then(newUser => Task.create({ title: 'some task' })
return newTask.setUser(newUser).then(() => { .then(newTask => newTask.setUser(newUser)))
return Task.findOne({ where: { title: 'some task' } }).then(foundTask => { .then(() => Task.findOne({ where: { title: 'some task' } }))
return foundTask.getUser().then(foundUser => { .then(foundTask => foundTask.getUser())
expect(foundUser.username).to.equal('bob'); .then(foundUser => expect(foundUser.username).to.equal('bob'))
}); .then(() => this.sequelize.getQueryInterface().getForeignKeyReferencesForTable('Tasks'))
}); .then(foreignKeysDescriptions => {
}); expect(foreignKeysDescriptions[0]).to.includes({
}); referencedColumnName: 'user_name',
referencedTableName: 'Users',
columnName: 'user_name'
}); });
}); });
}); });
...@@ -857,25 +861,67 @@ describe(Support.getTestDialectTeaser('BelongsTo'), () => { ...@@ -857,25 +861,67 @@ describe(Support.getTestDialectTeaser('BelongsTo'), () => {
const User = this.sequelize.define('User', { const User = this.sequelize.define('User', {
username: { username: {
type: DataTypes.STRING, type: DataTypes.STRING,
field: 'the_user_name_field' field: 'the_user_name_field',
unique: true
} }
}), });
Task = this.sequelize.define('Task', { title: DataTypes.STRING }); const Task = this.sequelize.define('Task', { title: DataTypes.STRING });
User.removeAttribute('id'); User.removeAttribute('id');
Task.belongsTo(User, { foreignKey: 'user_name', targetKey: 'username' }); Task.belongsTo(User, { foreignKey: 'user_name', targetKey: 'username' });
return this.sequelize.sync({ force: true }).then(() => { return this.sequelize.sync({ force: true })
return User.create({ username: 'bob' }).then(newUser => { .then(() => User.create({ username: 'bob' }))
return Task.create({ title: 'some task' }).then(newTask => { .then(newUser => Task.create({ title: 'some task' })
return newTask.setUser(newUser).then(() => { .then(newTask => newTask.setUser(newUser)))
return Task.findOne({ where: { title: 'some task' } }).then(foundTask => { .then(() => Task.findOne({ where: { title: 'some task' } }))
return foundTask.getUser().then(foundUser => { .then(foundTask => foundTask.getUser())
expect(foundUser.username).to.equal('bob'); .then(foundUser => expect(foundUser.username).to.equal('bob'))
.then(() => this.sequelize.getQueryInterface().getForeignKeyReferencesForTable('Tasks'))
.then(foreignKeysDescriptions => {
expect(foreignKeysDescriptions[0]).to.includes({
referencedColumnName: 'the_user_name_field',
referencedTableName: 'Users',
columnName: 'user_name'
}); });
}); });
}); });
it('should support a non-primary key as the association column in a table with a composite primary key', function() {
const User = this.sequelize.define('User', {
username: {
type: DataTypes.STRING,
field: 'the_user_name_field',
unique: true
},
age: {
type: DataTypes.INTEGER,
field: 'the_user_age_field',
primaryKey: true
},
weight: {
type: DataTypes.INTEGER,
field: 'the_user_weight_field',
primaryKey: true
}
}); });
const Task = this.sequelize.define('Task', { title: DataTypes.STRING });
Task.belongsTo(User, { foreignKey: 'user_name', targetKey: 'username' });
return this.sequelize.sync({ force: true })
.then(() => User.create({ username: 'bob', age: 18, weight: 40 }))
.then(newUser => Task.create({ title: 'some task' })
.then(newTask => newTask.setUser(newUser)))
.then(() => Task.findOne({ where: { title: 'some task' } }))
.then(foundTask => foundTask.getUser())
.then(foundUser => expect(foundUser.username).to.equal('bob'))
.then(() => this.sequelize.getQueryInterface().getForeignKeyReferencesForTable('Tasks'))
.then(foreignKeysDescriptions => {
expect(foreignKeysDescriptions[0]).to.includes({
referencedColumnName: 'the_user_name_field',
referencedTableName: 'Users',
columnName: 'user_name'
}); });
}); });
}); });
......
test/integration/include/findOne.test.js
...@@ -247,7 +247,7 @@ describe(Support.getTestDialectTeaser('Include'), () => { ...@@ -247,7 +247,7 @@ describe(Support.getTestDialectTeaser('Include'), () => {
}); });
it('should support a belongsTo with the targetKey option', function() { it('should support a belongsTo with the targetKey option', function() {
const User = this.sequelize.define('User', { username: DataTypes.STRING }), const User = this.sequelize.define('User', { username: { type: DataTypes.STRING, unique: true } }),
Task = this.sequelize.define('Task', { title: DataTypes.STRING }); Task = this.sequelize.define('Task', { title: DataTypes.STRING });
User.removeAttribute('id'); User.removeAttribute('id');
Task.belongsTo(User, { foreignKey: 'user_name', targetKey: 'username' }); Task.belongsTo(User, { foreignKey: 'user_name', targetKey: 'username' });
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!