不要怂,就是干,撸起袖子干!

Commit f6f9a41f by Jochem Maas

fix failing test related to SQL generated for bulk insertions - the SQL was corr…

…ect but the test assumed that the fields were specified in a different order (I think switching from `doa.values` to `dao.dataValues` affected the order of field names in generated SQL)
1 parent 4a8c9d77
Showing with 4 additions and 4 deletions
...@@ -372,7 +372,7 @@ describe(Helpers.getTestDialectTeaser("HasMany"), function() { ...@@ -372,7 +372,7 @@ describe(Helpers.getTestDialectTeaser("HasMany"), function() {
this.Task = this.sequelize.define('Task', { title: Sequelize.STRING }, {timestamps: false}) this.Task = this.sequelize.define('Task', { title: Sequelize.STRING }, {timestamps: false})
this.User.hasMany(this.Task) this.User.hasMany(this.Task)
this.Task.hasMany(this.User) this.Task.hasMany(this.User)
this.sequelize.sync({force: true}).success(done) this.sequelize.sync({force: true}).success(done)
}) })
...@@ -385,7 +385,7 @@ describe(Helpers.getTestDialectTeaser("HasMany"), function() { ...@@ -385,7 +385,7 @@ describe(Helpers.getTestDialectTeaser("HasMany"), function() {
this.Task.create({ title: 'task2' }).success(function(task2) { this.Task.create({ title: 'task2' }).success(function(task2) {
user.setTasks([task1, task2]).on('sql', spy).on('sql', _.after(2, function (sql) { user.setTasks([task1, task2]).on('sql', spy).on('sql', _.after(2, function (sql) {
expect(sql).toMatch("INSERT INTO") expect(sql).toMatch("INSERT INTO")
expect(sql).toMatch("VALUES (1,1),(2,1)") expect(sql).toMatch("VALUES (1,1),(1,2)")
})).success(function () { })).success(function () {
expect(spy).toHaveBeenCalledTwice() // Once for SELECT, once for INSERT into expect(spy).toHaveBeenCalledTwice() // Once for SELECT, once for INSERT into
done() done()
...@@ -415,7 +415,7 @@ describe(Helpers.getTestDialectTeaser("HasMany"), function() { ...@@ -415,7 +415,7 @@ describe(Helpers.getTestDialectTeaser("HasMany"), function() {
}.bind(this)) }.bind(this))
}) })
}) // end optimization using bulk create, destroy and update }) // end optimization using bulk create, destroy and update
describe('join table creation', function () { describe('join table creation', function () {
before(function (done) { before(function (done) {
this.User = this.sequelize.define('User', this.User = this.sequelize.define('User',
...@@ -430,7 +430,7 @@ describe(Helpers.getTestDialectTeaser("HasMany"), function() { ...@@ -430,7 +430,7 @@ describe(Helpers.getTestDialectTeaser("HasMany"), function() {
this.User.hasMany(this.Task, this.User.hasMany(this.Task,
{ joinTableName: 'user_has_tasks' } { joinTableName: 'user_has_tasks' }
) )
this.Task.hasMany(this.User) this.Task.hasMany(this.User)
this.sequelize.sync({force: true}).success(done) this.sequelize.sync({force: true}).success(done)
}) })
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!