Skip to content

public / sequelize

Go to a project

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

Commit 47b3f61e by overlookmotel Committed by Jan Aagaard Meier
Options

Restore `foreignKey` and `as` behaviour - reverts PR #5957 (#6109)

1 parent 4b2bc4a6
Inline Side-by-side
Showing with 40 additions and 97 deletions
changelog.md
...@@ -10,9 +10,11 @@ ...@@ -10,9 +10,11 @@
- [ADDED] `Model.count` now allow specifying column to count on, use `options.col` [#4442](https://github.com/sequelize/sequelize/issues/4442) - [ADDED] `Model.count` now allow specifying column to count on, use `options.col` [#4442](https://github.com/sequelize/sequelize/issues/4442)
- [ADDED] `DEBUG` support [#2852](https://github.com/sequelize/sequelize/issues/2852) - [ADDED] `DEBUG` support [#2852](https://github.com/sequelize/sequelize/issues/2852)
- [ADDED] Intensive connection logging [#851](https://github.com/sequelize/sequelize/issues/851) - [ADDED] Intensive connection logging [#851](https://github.com/sequelize/sequelize/issues/851)
- [FIXED] Only `belongsTo` uses `as` to construct foreign key - revert of [#5957](https://github.com/sequelize/sequelize/pull/5957) introduced in 4.0.0-0
## BC breaks: ## BC breaks:
- Range type bounds now default to [postgres default](https://www.postgresql.org/docs/9.5/static/rangetypes.html#RANGETYPES-CONSTRUCT) `[)` (inclusive, exclusive), previously was `()` (exclusive, exclusive) - Range type bounds now default to [postgres default](https://www.postgresql.org/docs/9.5/static/rangetypes.html#RANGETYPES-CONSTRUCT) `[)` (inclusive, exclusive), previously was `()` (exclusive, exclusive)
- Only `belongsTo` uses `as` to construct foreign key - revert of [#5957](https://github.com/sequelize/sequelize/pull/5957) introduced in 4.0.0-0
# 4.0.0-0 # 4.0.0-0
- [FIXED] Pass ResourceLock instead of raw connection in MSSQL disconnect handling - [FIXED] Pass ResourceLock instead of raw connection in MSSQL disconnect handling
......
docs/docs/associations.md
...@@ -189,7 +189,7 @@ var Project = sequelize.define('project', {/* ... */}) ...@@ -189,7 +189,7 @@ var Project = sequelize.define('project', {/* ... */})
Project.hasMany(User, {as: 'Workers'}) Project.hasMany(User, {as: 'Workers'})
``` ```
This will add the attribute `WorkersId` or `Workers_id` to User. Instances of Project will get the accessors `getWorkers` and `setWorkers`. We could just leave it the way it is and let it be a one-way association. This will add the attribute `projectId` or `project_id` to User. Instances of Project will get the accessors `getWorkers` and `setWorkers`. We could just leave it the way it is and let it be a one-way association.
But we want more! Let's define it the other way around by creating a many to many association in the next section: But we want more! Let's define it the other way around by creating a many to many association in the next section:
## Belongs-To-Many associations ## Belongs-To-Many associations
......
lib/associations/belongs-to-many.js
...@@ -112,7 +112,7 @@ class BelongsToMany extends Association { ...@@ -112,7 +112,7 @@ class BelongsToMany extends Association {
this.foreignKeyAttribute = {}; this.foreignKeyAttribute = {};
this.foreignKey = this.options.foreignKey || Utils.camelizeIf( this.foreignKey = this.options.foreignKey || Utils.camelizeIf(
[ [
Utils.underscoredIf(this.options.as || this.source.options.name.singular, this.source.options.underscored), Utils.underscoredIf(this.source.options.name.singular, this.source.options.underscored),
this.source.primaryKeyAttribute this.source.primaryKeyAttribute
].join('_'), ].join('_'),
!this.source.options.underscored !this.source.options.underscored
......
lib/associations/belongs-to.js
...@@ -47,7 +47,7 @@ class BelongsTo extends Association { ...@@ -47,7 +47,7 @@ class BelongsTo extends Association {
if (!this.foreignKey) { if (!this.foreignKey) {
this.foreignKey = Utils.camelizeIf( this.foreignKey = Utils.camelizeIf(
[ [
Utils.underscoredIf(this.options.as || this.as, this.source.options.underscored), Utils.underscoredIf(this.as, this.source.options.underscored),
this.target.primaryKeyAttribute this.target.primaryKeyAttribute
].join('_'), ].join('_'),
!this.source.options.underscored !this.source.options.underscored
......
lib/associations/has-many.js
...@@ -71,7 +71,7 @@ class HasMany extends Association { ...@@ -71,7 +71,7 @@ class HasMany extends Association {
if (!this.foreignKey) { if (!this.foreignKey) {
this.foreignKey = Utils.camelizeIf( this.foreignKey = Utils.camelizeIf(
[ [
Utils.underscoredIf(this.options.as || this.source.options.name.singular, this.source.options.underscored), Utils.underscoredIf(this.source.options.name.singular, this.source.options.underscored),
this.source.primaryKeyAttribute this.source.primaryKeyAttribute
].join('_'), ].join('_'),
!this.source.options.underscored !this.source.options.underscored
......
test/integration/associations/belongs-to-many.test.js
...@@ -470,14 +470,7 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), function() { ...@@ -470,14 +470,7 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), function() {
} }
}); });
var self = this; return expect(this.user.countActiveTasks({})).to.eventually.equal(1);
return this.UserTask.sync({ force: true })
.then(function() {
return self.user.setActiveTasks(self.tasks);
})
.then(function() {
return expect(self.user.countActiveTasks({})).to.eventually.equal(1);
});
}); });
it('should count scoped through associations', function () { it('should count scoped through associations', function () {
...@@ -493,23 +486,18 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), function() { ...@@ -493,23 +486,18 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), function() {
} }
}); });
return this.UserTask.sync({ force: true}) return Promise.join(
.bind(this) this.Task.create().then(function (task) {
.then(function() { return user.addTask(task, {
return Promise.join( started: true
this.Task.create().then(function (task) { });
return user.addStartedTask(task, { }),
started: true this.Task.create().then(function (task) {
}); return user.addTask(task, {
}), started: true
this.Task.create().then(function (task) { });
return user.addStartedTask(task, { })
started: true ).then(function () {
});
})
);
})
.then(function () {
return expect(user.countStartedTasks({})).to.eventually.equal(2); return expect(user.countStartedTasks({})).to.eventually.equal(2);
}); });
}); });
...@@ -1837,8 +1825,8 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), function() { ...@@ -1837,8 +1825,8 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), function() {
Group.belongsToMany(User, { as: 'MyUsers', through: 'group_user'}); Group.belongsToMany(User, { as: 'MyUsers', through: 'group_user'});
expect(Group.associations.MyUsers.through.model === User.associations.MyGroups.through.model); expect(Group.associations.MyUsers.through.model === User.associations.MyGroups.through.model);
expect(Group.associations.MyUsers.through.model.rawAttributes.MyGroupsId).to.exist; expect(Group.associations.MyUsers.through.model.rawAttributes.UserId).to.exist;
expect(Group.associations.MyUsers.through.model.rawAttributes.MyUsersId).to.exist; expect(Group.associations.MyUsers.through.model.rawAttributes.GroupId).to.exist;
}); });
it('correctly identifies its counterpart when through is a model', function() { it('correctly identifies its counterpart when through is a model', function() {
...@@ -1851,8 +1839,8 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), function() { ...@@ -1851,8 +1839,8 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), function() {
expect(Group.associations.MyUsers.through.model === User.associations.MyGroups.through.model); expect(Group.associations.MyUsers.through.model === User.associations.MyGroups.through.model);
expect(Group.associations.MyUsers.through.model.rawAttributes.MyGroupsId).to.exist; expect(Group.associations.MyUsers.through.model.rawAttributes.UserId).to.exist;
expect(Group.associations.MyUsers.through.model.rawAttributes.MyUsersId).to.exist; expect(Group.associations.MyUsers.through.model.rawAttributes.GroupId).to.exist;
}); });
}); });
...@@ -2158,7 +2146,7 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), function() { ...@@ -2158,7 +2146,7 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), function() {
Children = Person.belongsToMany(Person, { as: 'Children', through: PersonChildren}); Children = Person.belongsToMany(Person, { as: 'Children', through: PersonChildren});
expect(Children.foreignKey).to.equal('ChildrenId'); expect(Children.foreignKey).to.equal('PersonId');
expect(Children.otherKey).to.equal('ChildId'); expect(Children.otherKey).to.equal('ChildId');
expect(PersonChildren.rawAttributes[Children.foreignKey]).to.be.ok; expect(PersonChildren.rawAttributes[Children.foreignKey]).to.be.ok;
expect(PersonChildren.rawAttributes[Children.otherKey]).to.be.ok; expect(PersonChildren.rawAttributes[Children.otherKey]).to.be.ok;
...@@ -2168,7 +2156,7 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), function() { ...@@ -2168,7 +2156,7 @@ describe(Support.getTestDialectTeaser('BelongsToMany'), function() {
PersonChildren = this.sequelize.define('PersonChildren', {}, {underscored: true}); PersonChildren = this.sequelize.define('PersonChildren', {}, {underscored: true});
Children = Person.belongsToMany(Person, { as: 'Children', through: PersonChildren}); Children = Person.belongsToMany(Person, { as: 'Children', through: PersonChildren});
expect(Children.foreignKey).to.equal('children_id'); expect(Children.foreignKey).to.equal('person_id');
expect(Children.otherKey).to.equal('child_id'); expect(Children.otherKey).to.equal('child_id');
expect(PersonChildren.rawAttributes[Children.foreignKey]).to.be.ok; expect(PersonChildren.rawAttributes[Children.foreignKey]).to.be.ok;
expect(PersonChildren.rawAttributes[Children.otherKey]).to.be.ok; expect(PersonChildren.rawAttributes[Children.otherKey]).to.be.ok;
......
test/integration/associations/scope.test.js
...@@ -261,8 +261,8 @@ describe(Support.getTestDialectTeaser('associations'), function() { ...@@ -261,8 +261,8 @@ describe(Support.getTestDialectTeaser('associations'), function() {
this.PostTag = this.sequelize.define('post_tag'); this.PostTag = this.sequelize.define('post_tag');
this.Tag.belongsToMany(this.Post, {through: this.PostTag}); this.Tag.belongsToMany(this.Post, {through: this.PostTag});
this.Post.belongsToMany(this.Tag, {as: 'categories', through: this.PostTag, foreignKey: 'PostId', scope: { type: 'category' }}); this.Post.belongsToMany(this.Tag, {as: 'categories', through: this.PostTag, scope: { type: 'category' }});
this.Post.belongsToMany(this.Tag, {as: 'tags', through: this.PostTag, foreignKey: 'PostId', scope: { type: 'tag' }}); this.Post.belongsToMany(this.Tag, {as: 'tags', through: this.PostTag, scope: { type: 'tag' }});
}); });
it('should create, find and include associations with scope values', function() { it('should create, find and include associations with scope values', function() {
......
test/integration/include/findAll.test.js
...@@ -405,8 +405,8 @@ describe(Support.getTestDialectTeaser('Include'), function() { ...@@ -405,8 +405,8 @@ describe(Support.getTestDialectTeaser('Include'), function() {
]).spread(function(user, products) { ]).spread(function(user, products) {
return Promise.all([ return Promise.all([
GroupMember.bulkCreate([ GroupMember.bulkCreate([
{MembershipsId: user.id, GroupId: groups[0].id, RankId: ranks[0].id}, {UserId: user.id, GroupId: groups[0].id, RankId: ranks[0].id},
{MembershipsId: user.id, GroupId: groups[1].id, RankId: ranks[1].id} {UserId: user.id, GroupId: groups[1].id, RankId: ranks[1].id}
]), ]),
user.setProducts([ user.setProducts([
products[(i * 2) + 0], products[(i * 2) + 0],
......
test/integration/include/schema.test.js
...@@ -275,8 +275,8 @@ describe(Support.getTestDialectTeaser('Includes with schemas'), function() { ...@@ -275,8 +275,8 @@ describe(Support.getTestDialectTeaser('Includes with schemas'), function() {
]).spread(function(user, products) { ]).spread(function(user, products) {
return Promise.all([ return Promise.all([
GroupMember.bulkCreate([ GroupMember.bulkCreate([
{MembershipsId: user.id, GroupId: groups[0].id, RankId: ranks[0].id}, {AccUserId: user.id, GroupId: groups[0].id, RankId: ranks[0].id},
{MembershipsId: user.id, GroupId: groups[1].id, RankId: ranks[1].id} {AccUserId: user.id, GroupId: groups[1].id, RankId: ranks[1].id}
]), ]),
user.setProducts([ user.setProducts([
products[(i * 2) + 0], products[(i * 2) + 0],
......
test/integration/model/scope/associations.test.js
...@@ -96,7 +96,7 @@ describe(Support.getTestDialectTeaser('Model'), function() { ...@@ -96,7 +96,7 @@ describe(Support.getTestDialectTeaser('Model'), function() {
this.ScopeMe.hasOne(this.Profile, { foreignKey: 'userId' }); this.ScopeMe.hasOne(this.Profile, { foreignKey: 'userId' });
this.ScopeMe.belongsTo(this.Company); this.ScopeMe.belongsTo(this.Company);
this.UserAssociation = this.Company.hasMany(this.ScopeMe, { as: 'users', foreignKey: 'companyId'}); this.UserAssociation = this.Company.hasMany(this.ScopeMe, { as: 'users' });
return this.sequelize.sync({force: true}).bind(this).then(function() { return this.sequelize.sync({force: true}).bind(this).then(function() {
return Promise.all([ return Promise.all([
......
test/unit/associations/belongs-to-many.test.js
...@@ -512,10 +512,10 @@ describe(Support.getTestDialectTeaser('belongsToMany'), function() { ...@@ -512,10 +512,10 @@ describe(Support.getTestDialectTeaser('belongsToMany'), function() {
Group.belongsToMany(User, { as: 'MyUsers', through: 'group_user', onUpdate: 'SET NULL', onDelete: 'RESTRICT' }); Group.belongsToMany(User, { as: 'MyUsers', through: 'group_user', onUpdate: 'SET NULL', onDelete: 'RESTRICT' });
expect(Group.associations.MyUsers.through.model === User.associations.MyGroups.through.model); expect(Group.associations.MyUsers.through.model === User.associations.MyGroups.through.model);
expect(Group.associations.MyUsers.through.model.rawAttributes.MyGroupsId.onUpdate).to.equal('RESTRICT'); expect(Group.associations.MyUsers.through.model.rawAttributes.UserId.onUpdate).to.equal('RESTRICT');
expect(Group.associations.MyUsers.through.model.rawAttributes.MyGroupsId.onDelete).to.equal('SET NULL'); expect(Group.associations.MyUsers.through.model.rawAttributes.UserId.onDelete).to.equal('SET NULL');
expect(Group.associations.MyUsers.through.model.rawAttributes.MyUsersId.onUpdate).to.equal('SET NULL'); expect(Group.associations.MyUsers.through.model.rawAttributes.GroupId.onUpdate).to.equal('SET NULL');
expect(Group.associations.MyUsers.through.model.rawAttributes.MyUsersId.onDelete).to.equal('RESTRICT'); expect(Group.associations.MyUsers.through.model.rawAttributes.GroupId.onDelete).to.equal('RESTRICT');
}); });
it('work properly when through is a model', function() { it('work properly when through is a model', function() {
...@@ -527,25 +527,10 @@ describe(Support.getTestDialectTeaser('belongsToMany'), function() { ...@@ -527,25 +527,10 @@ describe(Support.getTestDialectTeaser('belongsToMany'), function() {
Group.belongsToMany(User, { as: 'MyUsers', through: UserGroup, onUpdate: 'SET NULL', onDelete: 'RESTRICT' }); Group.belongsToMany(User, { as: 'MyUsers', through: UserGroup, onUpdate: 'SET NULL', onDelete: 'RESTRICT' });
expect(Group.associations.MyUsers.through.model === User.associations.MyGroups.through.model); expect(Group.associations.MyUsers.through.model === User.associations.MyGroups.through.model);
expect(Group.associations.MyUsers.through.model.rawAttributes.MyGroupsId.onUpdate).to.equal('RESTRICT'); expect(Group.associations.MyUsers.through.model.rawAttributes.UserId.onUpdate).to.equal('RESTRICT');
expect(Group.associations.MyUsers.through.model.rawAttributes.MyGroupsId.onDelete).to.equal('SET NULL'); expect(Group.associations.MyUsers.through.model.rawAttributes.UserId.onDelete).to.equal('SET NULL');
expect(Group.associations.MyUsers.through.model.rawAttributes.MyUsersId.onUpdate).to.equal('SET NULL'); expect(Group.associations.MyUsers.through.model.rawAttributes.GroupId.onUpdate).to.equal('SET NULL');
expect(Group.associations.MyUsers.through.model.rawAttributes.MyUsersId.onDelete).to.equal('RESTRICT'); expect(Group.associations.MyUsers.through.model.rawAttributes.GroupId.onDelete).to.equal('RESTRICT');
}); });
}); });
it('properly use the `as` key to generate foreign key name', function(){
var City = current.define('City', { cityname: DataTypes.STRING })
, State = current.define('State', { statename: DataTypes.STRING })
, CityStateMap = current.define('CityStateMap', { rating: DataTypes.STRING });
State.belongsToMany(City, { through: CityStateMap });
expect(CityStateMap.attributes.StateId).not.to.be.empty;
expect(CityStateMap.attributes.CityId).not.to.be.empty;
State.belongsToMany(City, { through: CityStateMap, as: 'Test'});
expect(CityStateMap.attributes.TestId).not.to.be.empty;
expect(CityStateMap.attributes.CityId).not.to.be.empty;
});
}); });
test/unit/associations/belongs-to.test.js deleted 100644 → 0
'use strict';
/* jshint -W030 */
var chai = require('chai')
, expect = chai.expect
, Support = require(__dirname + '/../support')
, DataTypes = require(__dirname + '/../../../lib/data-types')
, current = Support.sequelize;
describe(Support.getTestDialectTeaser('hasOne'), function() {
it('properly use the `as` key to generate foreign key name', function(){
var User = current.define('User', { username: DataTypes.STRING })
, Task = current.define('Task', { title: DataTypes.STRING });
User.belongsTo(Task);
expect(User.attributes.TaskId).not.to.be.empty;
User.belongsTo(Task, {as : 'Naam'});
expect(User.attributes.NaamId).not.to.be.empty;
});
});
test/unit/associations/has-many.test.js
...@@ -162,15 +162,4 @@ describe(Support.getTestDialectTeaser('hasMany'), function() { ...@@ -162,15 +162,4 @@ describe(Support.getTestDialectTeaser('hasMany'), function() {
}); });
}); });
}); });
it('properly use the `as` key to generate foreign key name', function(){
var City = current.define('City', { cityname: DataTypes.STRING })
, State = current.define('State', { statename: DataTypes.STRING });
State.hasMany(City);
expect(City.attributes.StateId).not.to.be.empty;
State.hasMany(City, {as : 'Capital'});
expect(City.attributes.CapitalId).not.to.be.empty;
});
}); });
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!