Skip to content

public / sequelize

Go to a project

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

Commit 60943808 by Jan Aagaard Meier
Options

Add a test for merging of existing attribute with foreign key attribute

1 parent 13b436cf
Inline Side-by-side
Showing with 122 additions and 50 deletions
test/associations/belongs-to.test.js
...@@ -510,7 +510,26 @@ describe(Support.getTestDialectTeaser("BelongsTo"), function() { ...@@ -510,7 +510,26 @@ describe(Support.getTestDialectTeaser("BelongsTo"), function() {
}) })
}) })
it('allows the user to provide an attribute definition as foreignKey', function () { describe('allows the user to provide an attribute definition object as foreignKey', function () {
it('works with a column that hasnt been defined before', function () {
var Task = this.sequelize.define('task', {})
, User = this.sequelize.define('user', {
});
Task.belongsTo(User, {
foreignKey: {
allowNull: false,
fieldName: 'uid'
}
});
expect(Task.rawAttributes.uid).to.be.defined
expect(Task.rawAttributes.uid.allowNull).to.be.false;
expect(Task.rawAttributes.uid.references).to.equal(User.getTableName())
expect(Task.rawAttributes.uid.referencesKey).to.equal('id')
});
it('works when taking a column directly from the object', function () {
var User = this.sequelize.define('user', { var User = this.sequelize.define('user', {
uid: { uid: {
type: Sequelize.INTEGER, type: Sequelize.INTEGER,
...@@ -530,35 +549,23 @@ describe(Support.getTestDialectTeaser("BelongsTo"), function() { ...@@ -530,35 +549,23 @@ describe(Support.getTestDialectTeaser("BelongsTo"), function() {
expect(Profile.rawAttributes.user_id.references).to.equal(User.getTableName()) expect(Profile.rawAttributes.user_id.references).to.equal(User.getTableName())
expect(Profile.rawAttributes.user_id.referencesKey).to.equal('uid') expect(Profile.rawAttributes.user_id.referencesKey).to.equal('uid')
expect(Profile.rawAttributes.user_id.allowNull).to.be.false expect(Profile.rawAttributes.user_id.allowNull).to.be.false
})
it('allows the user to provide an attribute definition as foreignKey', function () {
var Task = this.sequelize.define('task', {})
, User = this.sequelize.define('user', {
uid: {
type: Sequelize.INTEGER,
primaryKey: true
}
}); });
Task.belongsTo(User, { it('works when merging with an existing definition', function () {
foreignKey: { var Task = this.sequelize.define('task', {
allowNull: false projectId: {
} defaultValue: 42,
});
expect(Task.rawAttributes.userUid.allowNull).to.be.false;
var Project = this.sequelize.define('project', {
user_id: {
type: Sequelize.INTEGER type: Sequelize.INTEGER
} }
}); })
, Project = this.sequelize.define('project', {});
Project.belongsTo(User, { foreignKey: Project.rawAttributes.user_id}); Task.belongsTo(Project, { foreignKey: { allowNull: true }});
expect(Project.rawAttributes.user_id.references).to.equal(User.getTableName()); expect(Task.rawAttributes.projectId).to.be.defined
expect(Project.rawAttributes.user_id.referencesKey).to.equal('uid'); expect(Task.rawAttributes.projectId.defaultValue).to.equal(42);
expect(Task.rawAttributes.projectId.allowNull).to.be.ok;
})
}); });
it('should throw an error if foreignKey and as result in a name clash', function () { it('should throw an error if foreignKey and as result in a name clash', function () {
......
test/associations/has-many.test.js
...@@ -2206,23 +2206,22 @@ describe(Support.getTestDialectTeaser("HasMany"), function() { ...@@ -2206,23 +2206,22 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
}); });
}); });
it('allows the user to provide an attribute definition as foreignKey', function () { describe('allows the user to provide an attribute definition object as foreignKey', function () {
it('works with a column that hasnt been defined before', function () {
var Task = this.sequelize.define('task', {}) var Task = this.sequelize.define('task', {})
, User = this.sequelize.define('user', { , User = this.sequelize.define('user', {});
uid: {
type: Sequelize.INTEGER,
primaryKey: true
}
});
User.hasMany(Task, { User.hasMany(Task, {
foreignKey: { foreignKey: {
fieldName: 'user_id', fieldName: 'uid',
allowNull: false allowNull: false
} }
}); });
expect(Task.rawAttributes.user_id.allowNull).to.be.false; expect(Task.rawAttributes.uid).to.be.defined;
expect(Task.rawAttributes.uid.allowNull).to.be.false;
expect(Task.rawAttributes.uid.references).to.equal(User.getTableName());
expect(Task.rawAttributes.uid.referencesKey).to.equal('id');
Task.hasMany(User, { Task.hasMany(User, {
foreignKey: { foreignKey: {
...@@ -2230,18 +2229,56 @@ describe(Support.getTestDialectTeaser("HasMany"), function() { ...@@ -2230,18 +2229,56 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
} }
}); });
expect(Task.rawAttributes.uid).not.to.be.defined;
expect(Task.associations.tasksusers.through.rawAttributes.taskId).to.be.defined;
expect(Task.associations.tasksusers.through.rawAttributes.taskId.allowNull).to.be.false; expect(Task.associations.tasksusers.through.rawAttributes.taskId.allowNull).to.be.false;
expect(Task.associations.tasksusers.through.rawAttributes.taskId.references).to.equal(Task.getTableName());
expect(Task.associations.tasksusers.through.rawAttributes.taskId.referencesKey).to.equal('id');
expect(Task.associations.tasksusers.through.rawAttributes.uid).to.be.defined;
expect(Task.associations.tasksusers.through.rawAttributes.uid.allowNull).to.be.false;
expect(Task.associations.tasksusers.through.rawAttributes.uid.references).to.equal(User.getTableName());
expect(Task.associations.tasksusers.through.rawAttributes.uid.referencesKey).to.equal('id');
});
it('works when taking a column directly from the object', function () {
var Project = this.sequelize.define('project', { var Project = this.sequelize.define('project', {
user_id: { user_id: {
type: Sequelize.INTEGER type: Sequelize.INTEGER,
defaultValue: 42
}
})
, User = this.sequelize.define('user', {
uid: {
type: Sequelize.INTEGER,
primaryKey: true
} }
}); });
User.hasMany(Project, { foreignKey: Project.rawAttributes.user_id}); User.hasMany(Project, { foreignKey: Project.rawAttributes.user_id});
expect(Project.rawAttributes.user_id).to.be.defined;
expect(Project.rawAttributes.user_id.references).to.equal(User.getTableName()); expect(Project.rawAttributes.user_id.references).to.equal(User.getTableName());
expect(Project.rawAttributes.user_id.referencesKey).to.equal('uid'); expect(Project.rawAttributes.user_id.referencesKey).to.equal('uid');
expect(Project.rawAttributes.user_id.defaultValue).to.equal(42);
});
it('works when merging with an existing definition', function () {
var Task = this.sequelize.define('task', {
userId: {
defaultValue: 42,
type: Sequelize.INTEGER
}
})
, User = this.sequelize.define('user', {});
User.hasMany(Task, { foreignKey: { allowNull: true }});
expect(Task.rawAttributes.userId).to.be.defined;
expect(Task.rawAttributes.userId.defaultValue).to.equal(42);
expect(Task.rawAttributes.userId.allowNull).to.be.ok;
});
}); });
it('should throw an error if foreignKey and as result in a name clash', function () { it('should throw an error if foreignKey and as result in a name clash', function () {
......
test/associations/has-one.test.js
...@@ -471,7 +471,25 @@ describe(Support.getTestDialectTeaser("HasOne"), function() { ...@@ -471,7 +471,25 @@ describe(Support.getTestDialectTeaser("HasOne"), function() {
}) })
}) })
it('allows the user to provide an attribute definition as foreignKey', function () { describe('allows the user to provide an attribute definition object as foreignKey', function () {
it('works with a column that hasnt been defined before', function () {
var User = this.sequelize.define('user', {})
, Profile = this.sequelize.define('project', {})
User.hasOne(Profile, {
foreignKey: {
allowNull: false,
fieldName: 'uid'
}
});
expect(Profile.rawAttributes.uid).to.be.defined
expect(Profile.rawAttributes.uid.references).to.equal(User.getTableName())
expect(Profile.rawAttributes.uid.referencesKey).to.equal('id')
expect(Profile.rawAttributes.uid.allowNull).to.be.false;
});
it('works when taking a column directly from the object', function () {
var User = this.sequelize.define('user', { var User = this.sequelize.define('user', {
uid: { uid: {
type: Sequelize.INTEGER, type: Sequelize.INTEGER,
...@@ -487,25 +505,35 @@ describe(Support.getTestDialectTeaser("HasOne"), function() { ...@@ -487,25 +505,35 @@ describe(Support.getTestDialectTeaser("HasOne"), function() {
User.hasOne(Profile, { foreignKey: Profile.rawAttributes.user_id}) User.hasOne(Profile, { foreignKey: Profile.rawAttributes.user_id})
var Project = this.sequelize.define('project', { expect(Profile.rawAttributes.user_id).to.be.defined
user_id: { expect(Profile.rawAttributes.user_id.references).to.equal(User.getTableName())
type: Sequelize.INTEGER expect(Profile.rawAttributes.user_id.referencesKey).to.equal('uid')
} expect(Profile.rawAttributes.user_id.allowNull).to.be.false;
}); });
User.hasOne(Project, { it('works when merging with an existing definition', function () {
foreignKey: { var User = this.sequelize.define('user', {
allowNull: false uid: {
type: Sequelize.INTEGER,
primaryKey: true
} }
}) })
, Project = this.sequelize.define('project', {
userUid: {
type: Sequelize.INTEGER,
defaultValue: 42
}
});
expect(Project.rawAttributes.userUid.allowNull).to.be.false; User.hasOne(Project, { foreignKey: { allowNull: false }});
expect(Profile.rawAttributes.user_id).to.be.defined expect(Project.rawAttributes.userUid).to.be.defined;
expect(Profile.rawAttributes.user_id.references).to.equal(User.getTableName()) expect(Project.rawAttributes.userUid.allowNull).to.be.false;
expect(Profile.rawAttributes.user_id.referencesKey).to.equal('uid') expect(Project.rawAttributes.userUid.references).to.equal(User.getTableName())
expect(Profile.rawAttributes.user_id.allowNull).to.be.false expect(Project.rawAttributes.userUid.referencesKey).to.equal('uid')
}) expect(Project.rawAttributes.userUid.defaultValue).to.equal(42);
});
});
it('should throw an error if an association clashes with the name of an already define attribute', function () { it('should throw an error if an association clashes with the name of an already define attribute', function () {
var User = this.sequelize.define('user', { var User = this.sequelize.define('user', {
......
test/include/findAll.test.js
...@@ -935,7 +935,7 @@ describe(Support.getTestDialectTeaser("Include"), function () { ...@@ -935,7 +935,7 @@ describe(Support.getTestDialectTeaser("Include"), function () {
it("should be possible to define a belongsTo include as required with child hasMany not required", function(done) { it.only("should be possible to define a belongsTo include as required with child hasMany not required", function(done) {
var S = this.sequelize var S = this.sequelize
, Address = S.define('Address', { 'active': DataTypes.BOOLEAN }) , Address = S.define('Address', { 'active': DataTypes.BOOLEAN })
, Street = S.define('Street', { 'active': DataTypes.BOOLEAN }) , Street = S.define('Street', { 'active': DataTypes.BOOLEAN })
......
test/support.js
...@@ -74,7 +74,7 @@ var Support = { ...@@ -74,7 +74,7 @@ var Support = {
var sequelizeOptions = _.defaults(options, { var sequelizeOptions = _.defaults(options, {
host: options.host || config.host, host: options.host || config.host,
logging: false, // logging: false,
dialect: options.dialect, dialect: options.dialect,
port: options.port || process.env.SEQ_PORT || config.port, port: options.port || process.env.SEQ_PORT || config.port,
pool: config.pool, pool: config.pool,
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!