Merge branch 'master' into hotfix/transaction_timeout

Sascha Depold
Commit 4ebe4bcc authored Feb 25, 2014 by Sascha Depold
Showing with 83 additions and 14 deletions
changelog.md
lib/associations/has-many-double-linked.js
lib/dialects/abstract/query-generator.js
package.json
test/associations/has-many.test.js
test/dao-factory/findAll.test.js
--- a/changelog.md
+++ b/changelog.md
 Notice: All 1.7.x changes are present in 2.0.x aswell
-# v1.7.0-rc9 (next)
+# v1.7.0 (next)
+- [FEATURE] covers more advanced include cases with limiting and filtering
+# v1.7.0-rc9
 - [PERFORMANCE] fixes performance regression introduced in rc7
 - [FEATURE] include all relations for a model [#1421](https://github.com/sequelize/sequelize/pull/1421)
- [FEATURE] covers more advanced include cases with limiting and filtering
+- [BUG] N:M adder/getter with through model and custom primary keys now work
 # v1.7.0-rc8
 - [BUG] fixes bug with required includes without wheres with subqueries

--- a/lib/associations/has-many-double-linked.js
+++ b/lib/associations/has-many-double-linked.js
@@ -25,16 +25,12 @@ module.exports = (function() {
      //fully qualify
      var instancePrimaryKeys = Object.keys(self.instance.daoFactory.primaryKeys)
        , instancePrimaryKey = instancePrimaryKeys.length > 0 ? instancePrimaryKeys[0] : 'id'
-      where[through.tableName+"."+self.association.identifier] = self.instance[instancePrimaryKey]
-      var primaryKeys = Object.keys(through.primaryKeys)
-        , foreignKey  = primaryKeys.filter(function(pk) { return pk != self.association.identifier })[0]
        , foreignPrimary = Object.keys(self.association.target.primaryKeys)
      foreignPrimary = foreignPrimary.length === 1 ? foreignPrimary[0] : 'id'
-      where[through.tableName+"."+foreignKey] = {join: self.association.target.tableName+"."+foreignPrimary}
+      where[through.tableName+"."+self.association.identifier] = self.instance[instancePrimaryKey]
+      where[through.tableName+"."+self.association.foreignIdentifier] = {join: self.association.target.tableName+"."+foreignPrimary}
      if (Object(targetAssociation.through) === targetAssociation.through) {
        queryOptions.hasJoinTableModel = true

--- a/lib/dialects/abstract/query-generator.js
+++ b/lib/dialects/abstract/query-generator.js
@@ -780,7 +780,7 @@ module.exports = (function() {
        if (Array.isArray(options.order)) {
          options.order.forEach(function (t) {
-            if (subQuery && !(t[0] instanceof daoFactory)) {
+            if (subQuery && !(t[0] instanceof daoFactory) && !(t[0].model instanceof daoFactory)) {
              subQueryOrder.push(this.quote(t, factory))
            }
            mainQueryOrder.push(this.quote(t, factory))

--- a/package.json
+++ b/package.json
 {
  "name": "sequelize",
  "description": "Multi dialect ORM for Node.JS",
-  "version": "1.7.0-rc8",
+  "version": "1.7.0-rc9",
  "author": "Sascha Depold <sascha@depold.com>",
  "contributors": [
    {

--- a/test/associations/has-many.test.js
+++ b/test/associations/has-many.test.js
@@ -946,7 +946,7 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
      })
    })
-    describe('join table model', function () {
+    describe('through', function () {
      beforeEach(function (done) {
        this.User = this.sequelize.define('User', {})
        this.Project = this.sequelize.define('Project', {})
@@ -1049,9 +1049,56 @@ describe(Support.getTestDialectTeaser("HasMany"), function() {
            this.sequelize.sync().done(function(err) {
              expect(err).not.to.be.ok
-              Worker.create().done(function (err, worker) {
+              Worker.create({id: 1337}).done(function (err, worker) {
+                expect(err).not.to.be.ok
+                Task.create({id: 7331}).done(function (err, task) {
+                  expect(err).not.to.be.ok
+                  worker.addTask(task).done(function (err) {
+                    expect(err).not.to.be.ok
+                    worker.addTask(task).done(function (err) {
+                      expect(err).not.to.be.ok
+                      done()
+                    })
+                  })
+                })
+              })
+            })
+          })
+          it('should be able to add twice (second call result in UPDATE call) with custom primary keys and without any attributes (and timestamps off) on the through model', function (done) {
+            var Worker = this.sequelize.define('Worker', {
+                id: {
+                  type: DataTypes.INTEGER,
+                  allowNull: false,
+                  primaryKey: true,
+                  autoIncrement: true
+                }
+              }, {timestamps: false})
+              , Task = this.sequelize.define('Task', {
+                id: {
+                  type: DataTypes.INTEGER,
+                  allowNull: false,
+                  primaryKey: true,
+                  autoIncrement: true
+                }
+              }, {timestamps: false})
+              , WorkerTasks = this.sequelize.define('WorkerTasks', {
+                id: {
+                  type: DataTypes.INTEGER,
+                  allowNull: false,
+                  primaryKey: true,
+                  autoIncrement: true
+                }
+              }, {timestamps: false})
+            Worker.hasMany(Task, { through: WorkerTasks })
+            Task.hasMany(Worker, { through: WorkerTasks })
+            this.sequelize.sync().done(function(err) {
+              expect(err).not.to.be.ok
+              Worker.create({id: 1337}).done(function (err, worker) {
                expect(err).not.to.be.ok
-                Task.create().done(function (err, task) {
+                Task.create({id: 7331}).done(function (err, task) {
                  expect(err).not.to.be.ok
                  worker.addTask(task).done(function (err) {
                    expect(err).not.to.be.ok

--- a/test/dao-factory/findAll.test.js
+++ b/test/dao-factory/findAll.test.js
@@ -1039,7 +1039,7 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
              callback()
            })
          }, function() {done()})
-        }),
+        })
        it('sorts by 2nd degree association', function(done) {
          var self = this
@@ -1084,6 +1084,29 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
            })
          }, function() {done()})
        })
+        it('sorts by 2nd degree association with alias while using limit', function(done) {
+          var self = this
+          async.forEach([ [ 'ASC', 'Europe', 'France', 'Fred' ], [ 'DESC', 'Europe', 'England', 'Kim' ] ], function(params, callback) {
+            self.Continent.findAll({
+              include: [ { model: self.Country, include: [ self.Person, {model: self.Person, as: 'Residents' } ] } ],
+              order: [ [ { model: self.Country }, {model: self.Person, as: 'Residents' }, 'lastName', params[0] ] ],
+              limit: 3
+            }).done(function(err, continents) {
+              expect(err).not.to.be.ok
+              expect(continents).to.exist
+              expect(continents[0]).to.exist
+              expect(continents[0].name).to.equal(params[1])
+              expect(continents[0].countries).to.exist
+              expect(continents[0].countries[0]).to.exist
+              expect(continents[0].countries[0].name).to.equal(params[2])
+              expect(continents[0].countries[0].residents).to.exist
+              expect(continents[0].countries[0].residents[0]).to.exist
+              expect(continents[0].countries[0].residents[0].name).to.equal(params[3])
+              callback()
+            })
+          }, function() {done()})
+        })
      }),
      describe('ManyToMany', function() {