Merge branch 'nonidpk' of https://github.com/lemon-tree/sequelize into lemon-tree-nonidpk

lib/associations/belongs-to.js

@@ -22,9 +22,11 @@ module.exports = (function() {
   // the id is in the source table
   BelongsTo.prototype.injectAttributes = function() {
     var newAttributes  = {}
+      , targetKeys     = Object.keys(this.target.primaryKeys)
+      , keyType        = ((this.target.hasPrimaryKeys && targetKeys.length === 1) ? this.target.rawAttributes[targetKeys[0]].type : DataTypes.INTEGER)
 
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.target.tableName, this.target.options.language) + "Id", this.source.options.underscored)
-    newAttributes[this.identifier] = { type: this.options.keyType || DataTypes.INTEGER }
+    newAttributes[this.identifier] = { type: this.options.keyType || keyType }
     Helpers.addForeignKeyConstraints(newAttributes[this.identifier], this.target, this.source, this.options)
     Utils._.defaults(this.source.rawAttributes, newAttributes)
 

lib/associations/has-many-double-linked.js

@@ -57,30 +57,32 @@ module.exports = (function() {
     var self = this
       , chainer             = new Utils.QueryChainer()
       , association         = self.__factory.target.associations[self.__factory.associationAccessor]
-      , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier;
+      , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier
+      , sourceKeys          = Object.keys(self.__factory.source.primaryKeys)
+      , targetKeys          = Object.keys(self.__factory.target.primaryKeys)
 
     var obsoleteAssociations = oldAssociations.filter(function (old) {
-          // Return only those old associations that are not found in new
-          return !Utils._.find(newAssociations, function (obj) {
-            return (!!obj[foreignIdentifier] && !!old[foreignIdentifier] ? obj[foreignIdentifier] === old[foreignIdentifier] : obj.id === old.id)
-          })
-        })
-     , unassociatedObjects = newAssociations.filter(function (obj) {
-          return !Utils._.find(oldAssociations, function (old) {
-            return (!!obj[foreignIdentifier] && !!old[foreignIdentifier] ? obj[foreignIdentifier] === old[foreignIdentifier] : obj.id === old.id)
-          })
-        })
+      // Return only those old associations that are not found in new
+      return !Utils._.find(newAssociations, function (obj) {
+        return ((targetKeys.length === 1) ? obj[targetKeys[0]] === old[targetKeys[0]] : obj.id === old.id)
+      })
+    })
+
+    var unassociatedObjects = newAssociations.filter(function (obj) {
+      // Return only those associations that are new
+      return !Utils._.find(oldAssociations, function (old) {
+        return ((targetKeys.length === 1) ? obj[targetKeys[0]] === old[targetKeys[0]] : obj.id === old.id)
+      })
+    })
 
     if (obsoleteAssociations.length > 0) {
       var foreignIds = obsoleteAssociations.map(function (associatedObject) {
-            return associatedObject.id
-          })
-        , primaryKeys      = Object.keys(self.__factory.connectorDAO.rawAttributes)
-        , foreignKey       = primaryKeys.filter(function(pk) { return pk != self.__factory.identifier })[0]
+        return ((targetKeys.length === 1) ? associatedObject[targetKeys[0]] : associatedObject.id)
+      })
 
       var where = {}
-      where[self.__factory.identifier] = self.instance[self.__factory.identifier] || self.instance.id
-      where[foreignKey] = foreignIds
+      where[self.__factory.identifier] = ((sourceKeys.length === 1) ? self.instance[sourceKeys[0]] : self.instance.id)
+      where[foreignIdentifier] = foreignIds
 
       chainer.add(self.__factory.connectorDAO.destroy(where))
     }
@@ -88,8 +90,8 @@ module.exports = (function() {
     if (unassociatedObjects.length > 0) {
       var bulk = unassociatedObjects.map(function(unassociatedObject) {
         var attributes = {}
-        attributes[self.__factory.identifier] = self.instance[self.__factory.identifier] || self.instance.id
-        attributes[foreignIdentifier] = unassociatedObject[foreignIdentifier] || unassociatedObject.id
+        attributes[self.__factory.identifier] = ((sourceKeys.length === 1) ? self.instance[sourceKeys[0]] : self.instance.id)
+        attributes[foreignIdentifier] = ((targetKeys.length === 1) ? unassociatedObject[targetKeys[0]] : unassociatedObject.id)
 
         return attributes
       })
@@ -109,8 +111,11 @@ module.exports = (function() {
       , association         = this.__factory.target.associations[this.__factory.associationAccessor]
       , foreignIdentifier   = association.isSelfAssociation ? association.foreignIdentifier : association.identifier;
 
-    attributes[this.__factory.identifier] = this.instance[this.__factory.identifier] || this.instance.id
-    attributes[foreignIdentifier] = newAssociation[foreignIdentifier] || newAssociation.id
+    var sourceKeys = Object.keys(this.__factory.source.primaryKeys);
+    var targetKeys = Object.keys(this.__factory.target.primaryKeys);
+
+    attributes[this.__factory.identifier] = ((sourceKeys.length === 1) ? this.instance[sourceKeys[0]] : this.instance.id)
+    attributes[foreignIdentifier] = ((targetKeys.length === 1) ? newAssociation[targetKeys[0]] : newAssociation.id)
 
     this.__factory.connectorDAO.create(attributes)
       .success(function() { emitterProxy.emit('success', newAssociation) })

lib/associations/has-many.js

@@ -54,9 +54,12 @@ module.exports = (function() {
 
       // define a new model, which connects the models
       var combinedTableAttributes = {}
-      var keyType = this.options.keyType || DataTypes.INTEGER
-      combinedTableAttributes[this.identifier] = {type: keyType, primaryKey: true}
-      combinedTableAttributes[this.foreignIdentifier] = {type: keyType, primaryKey: true}
+      var sourceKeys = Object.keys(this.source.primaryKeys);
+      var sourceKeyType = ((!this.source.hasPrimaryKeys || sourceKeys.length !== 1) ? DataTypes.INTEGER : this.source.rawAttributes[sourceKeys[0]].type)
+      var targetKeys = Object.keys(this.target.primaryKeys);
+      var targetKeyType = ((!this.target.hasPrimaryKeys || targetKeys.length !== 1) ? DataTypes.INTEGER : this.target.rawAttributes[targetKeys[0]].type)
+      combinedTableAttributes[this.identifier] = {type: sourceKeyType, primaryKey: true}
+      combinedTableAttributes[this.foreignIdentifier] = {type: targetKeyType, primaryKey: true}
 
       this.connectorDAO = this.source.daoFactoryManager.sequelize.define(this.combinedName, combinedTableAttributes, this.options)
 

lib/associations/has-one.js

@@ -27,9 +27,11 @@ module.exports = (function() {
   // the id is in the target table
   HasOne.prototype.injectAttributes = function() {
     var newAttributes = {}
+      , sourceKeys    = Object.keys(this.source.primaryKeys)
+      , keyType       = ((this.source.hasPrimaryKeys && sourceKeys.length === 1) ? this.source.rawAttributes[sourceKeys[0]].type : DataTypes.INTEGER)
 
     this.identifier = this.options.foreignKey || Utils._.underscoredIf(Utils.singularize(this.source.tableName, this.source.options.language) + "Id", this.options.underscored)
-    newAttributes[this.identifier] = { type: this.options.keyType || DataTypes.INTEGER }
+    newAttributes[this.identifier] = { type: this.options.keyType || keyType }
     Helpers.addForeignKeyConstraints(newAttributes[this.identifier], this.source, this.target, this.options)
     Utils._.defaults(this.target.rawAttributes, newAttributes)
 

lib/dialects/mysql/query-generator.js

@@ -188,26 +188,31 @@ module.exports = (function() {
 
           optAttributes = optAttributes.concat(attributes)
 
+          var table = include.daoFactory.tableName
+            , as    = include.as
+
           if (!include.association.connectorDAO) {
-            var table = include.daoFactory.tableName
-            var as = include.as
-            var tableLeft = ((include.association.associationType === 'BelongsTo') ? include.as : tableName)
-            var attrLeft = 'id'
-            var tableRight = ((include.association.associationType === 'BelongsTo') ? tableName : include.as)
-            var attrRight = include.association.identifier
+            var primaryKeysLeft = ((include.association.associationType === 'BelongsTo') ? Object.keys(include.association.target.primaryKeys) : Object.keys(include.association.source.primaryKeys))
+              , tableLeft       = ((include.association.associationType === 'BelongsTo') ? include.as : tableName)
+              , attrLeft        = ((primaryKeysLeft.length !== 1) ? 'id' : primaryKeysLeft[0])
+              , tableRight      = ((include.association.associationType === 'BelongsTo') ? tableName : include.as)
+              , attrRight       = include.association.identifier
+
             joinQuery += " LEFT OUTER JOIN " + this.quoteIdentifier(table) + " AS " + this.quoteIdentifier(as) + " ON " + this.quoteIdentifier(tableLeft) + "." + this.quoteIdentifier(attrLeft) + " = " + this.quoteIdentifier(tableRight) + "." + this.quoteIdentifier(attrRight)
           } else {
-            var table = include.daoFactory.tableName
-            var as = include.as
-            var tableLeft = tableName
-            var identLeft = include.association.identifier
-            var attrLeft = 'id'
-            var tableRight = include.as
-            var identRight = include.association.foreignIdentifier
-            var attrRight = 'id'
-            var tableJunction = include.association.connectorDAO.tableName
-            joinQuery += " LEFT OUTER JOIN " + this.quoteIdentifier(tableJunction) + " ON " + this.quoteIdentifier(tableLeft) + "." + this.quoteIdentifier(attrLeft) + " = " + this.quoteIdentifier(tableJunction) + "." + this.quoteIdentifier(identLeft)
-            joinQuery += " LEFT OUTER JOIN " + this.quoteIdentifier(table) + " AS " + this.quoteIdentifier(as) + " ON " + this.quoteIdentifier(tableRight) + "." + this.quoteIdentifier(attrRight) + " = " + this.quoteIdentifier(tableJunction) + "." + this.quoteIdentifier(identRight)
+            var primaryKeysSource = Object.keys(include.association.source.primaryKeys)
+              , tableSource       = tableName
+              , identSource       = include.association.identifier
+              , attrSource        = ((!include.association.source.hasPrimaryKeys || primaryKeysSource.length !== 1) ? 'id' : primaryKeysSource[0])
+
+            var primaryKeysTarget = Object.keys(include.association.target.primaryKeys)
+              , tableTarget       = include.as
+              , identTarget       = include.association.foreignIdentifier
+              , attrTarget        = ((!include.association.target.hasPrimaryKeys || primaryKeysTarget.length !== 1) ? 'id' : primaryKeysTarget[0])
+
+            var tableJunction     = include.association.connectorDAO.tableName
+            joinQuery += " LEFT OUTER JOIN " + this.quoteIdentifier(tableJunction) + " ON " + this.quoteIdentifier(tableSource) + "." + this.quoteIdentifier(attrSource) + " = " + this.quoteIdentifier(tableJunction) + "." + this.quoteIdentifier(identSource)
+            joinQuery += " LEFT OUTER JOIN " + this.quoteIdentifier(table) + " AS " + this.quoteIdentifier(as) + " ON " + this.quoteIdentifier(tableTarget) + "." + this.quoteIdentifier(attrTarget) + " = " + this.quoteIdentifier(tableJunction) + "." + this.quoteIdentifier(identTarget)
           }
         }.bind(this))
 

lib/dialects/postgres/query-generator.js

@@ -258,20 +258,24 @@ module.exports = (function() {
           var joinQuery = ' LEFT OUTER JOIN <%= table %> AS <%= as %> ON <%= tableLeft %>.<%= attrLeft %> = <%= tableRight %>.<%= attrRight %>'
 
           if (!include.association.connectorDAO) {
+            var primaryKeysLeft = ((include.association.associationType === 'BelongsTo') ? Object.keys(include.association.target.primaryKeys) : Object.keys(include.association.source.primaryKeys))
             query += Utils._.template(joinQuery)({
               table:      this.quoteIdentifiers(include.daoFactory.tableName),
               as:         this.quoteIdentifier(include.as),
               tableLeft:  this.quoteIdentifiers((include.association.associationType === 'BelongsTo') ? include.as : tableName),
-              attrLeft:   this.quoteIdentifier('id'),
+              attrLeft:   this.quoteIdentifier(((primaryKeysLeft.length !== 1) ? 'id' : primaryKeysLeft[0])),
               tableRight: this.quoteIdentifiers((include.association.associationType === 'BelongsTo') ? tableName : include.as),
               attrRight:  this.quoteIdentifier(include.association.identifier)
             })
           } else {
+            var primaryKeysSource = Object.keys(include.association.source.primaryKeys)
+              , primaryKeysTarget = Object.keys(include.association.target.primaryKeys)
+
             query += Utils._.template(joinQuery)({
               table:      this.quoteIdentifiers(include.association.connectorDAO.tableName),
               as:         this.quoteIdentifier(include.association.connectorDAO.tableName),
               tableLeft:  this.quoteIdentifiers(tableName),
-              attrLeft:   this.quoteIdentifier('id'),
+              attrLeft:   this.quoteIdentifier(((!include.association.source.hasPrimaryKeys || primaryKeysSource.length !== 1) ? 'id' : primaryKeysSource[0])),
               tableRight: this.quoteIdentifiers(include.association.connectorDAO.tableName),
               attrRight:  this.quoteIdentifier(include.association.identifier)
             })
@@ -280,7 +284,7 @@ module.exports = (function() {
               table:      this.quoteIdentifiers(include.daoFactory.tableName),
               as:         this.quoteIdentifier(include.as),
               tableLeft:  this.quoteIdentifiers(include.as),
-              attrLeft:   this.quoteIdentifier('id'),
+              attrLeft:   this.quoteIdentifier(((!include.association.target.hasPrimaryKeys || primaryKeysTarget.length !== 1) ? 'id' : primaryKeysTarget[0])),
               tableRight: this.quoteIdentifiers(include.association.connectorDAO.tableName),
               attrRight:  this.quoteIdentifier(include.association.foreignIdentifier)
             })

lib/dialects/sqlite/query-generator.js

@@ -170,26 +170,31 @@ module.exports = (function() {
 
           optAttributes = optAttributes.concat(attributes)
 
+          var table = include.daoFactory.tableName
+            , as    = include.as
+
           if (!include.association.connectorDAO) {
-            var table = include.daoFactory.tableName
-            var as = include.as
-            var tableLeft = ((include.association.associationType === 'BelongsTo') ? include.as : tableName)
-            var attrLeft = 'id'
-            var tableRight = ((include.association.associationType === 'BelongsTo') ? tableName : include.as)
-            var attrRight = include.association.identifier
+            var primaryKeysLeft = ((include.association.associationType === 'BelongsTo') ? Object.keys(include.association.target.primaryKeys) : Object.keys(include.association.source.primaryKeys))
+              , tableLeft       = ((include.association.associationType === 'BelongsTo') ? include.as : tableName)
+              , attrLeft        = ((primaryKeysLeft.length !== 1) ? 'id' : primaryKeysLeft[0])
+              , tableRight      = ((include.association.associationType === 'BelongsTo') ? tableName : include.as)
+              , attrRight       = include.association.identifier
+              
             joinQuery += " LEFT OUTER JOIN " + this.quoteIdentifier(table) + " AS " + this.quoteIdentifier(as) + " ON " + this.quoteIdentifier(tableLeft) + "." + this.quoteIdentifier(attrLeft) + " = " + this.quoteIdentifier(tableRight) + "." + this.quoteIdentifier(attrRight)
           } else {
-            var table = include.daoFactory.tableName
-            var as = include.as
-            var tableLeft = tableName
-            var identLeft = include.association.identifier
-            var attrLeft = 'id'
-            var tableRight = include.as
-            var identRight = include.association.foreignIdentifier
-            var attrRight = 'id'
-            var tableJunction = include.association.connectorDAO.tableName
-            joinQuery += " LEFT OUTER JOIN " + this.quoteIdentifier(tableJunction) + " ON " + this.quoteIdentifier(tableLeft) + "." + this.quoteIdentifier(attrLeft) + " = " + this.quoteIdentifier(tableJunction) + "." + this.quoteIdentifier(identLeft)
-            joinQuery += " LEFT OUTER JOIN " + this.quoteIdentifier(table) + " AS " + this.quoteIdentifier(as) + " ON " + this.quoteIdentifier(tableRight) + "." + this.quoteIdentifier(attrRight) + " = " + this.quoteIdentifier(tableJunction) + "." + this.quoteIdentifier(identRight)
+            var primaryKeysSource = Object.keys(include.association.source.primaryKeys)
+              , tableSource       = tableName
+              , identSource       = include.association.identifier
+              , attrSource        = ((!include.association.source.hasPrimaryKeys || primaryKeysSource.length !== 1) ? 'id' : primaryKeysSource[0])
+
+            var primaryKeysTarget = Object.keys(include.association.target.primaryKeys)
+              , tableTarget       = include.as
+              , identTarget       = include.association.foreignIdentifier
+              , attrTarget        = ((!include.association.target.hasPrimaryKeys || primaryKeysTarget.length !== 1) ? 'id' : primaryKeysTarget[0])
+
+            var tableJunction     = include.association.connectorDAO.tableName
+            joinQuery += " LEFT OUTER JOIN " + this.quoteIdentifier(tableJunction) + " ON " + this.quoteIdentifier(tableSource) + "." + this.quoteIdentifier(attrSource) + " = " + this.quoteIdentifier(tableJunction) + "." + this.quoteIdentifier(identSource)
+            joinQuery += " LEFT OUTER JOIN " + this.quoteIdentifier(table) + " AS " + this.quoteIdentifier(as) + " ON " + this.quoteIdentifier(tableTarget) + "." + this.quoteIdentifier(attrTarget) + " = " + this.quoteIdentifier(tableJunction) + "." + this.quoteIdentifier(identTarget)
           }
 
         }.bind(this))

test/associations/belongs-to.test.js

@@ -192,6 +192,31 @@ describe(Support.getTestDialectTeaser("BelongsTo"), function() {
     })
   })
 
+  describe("Association column", function() {
+    it('has correct type for non-id primary keys with non-integer type', function(done) {
+      var User = this.sequelize.define('UserPKBT', { 
+        username: { 
+          type: DataTypes.STRING
+        }
+      })
+        , self = this
+
+      var Group = this.sequelize.define('GroupPKBT', { 
+        name: { 
+          type: DataTypes.STRING,
+          primaryKey: true
+        }
+      })
+
+      User.belongsTo(Group)
+
+      self.sequelize.sync({ force: true }).success(function() {
+        expect(User.rawAttributes.GroupPKBTId.type.toString()).to.equal(DataTypes.STRING.toString())
+        done()
+      })
+    })
+  })
+
   describe("Association options", function() {
     it('can specify data type for autogenerated relational keys', function(done) {
       var User = this.sequelize.define('UserXYZ', { username: DataTypes.STRING })

test/associations/has-one.test.js

@@ -229,6 +229,31 @@ describe(Support.getTestDialectTeaser("HasOne"), function() {
 
   })
 
+  describe("Association column", function() {
+    it('has correct type for non-id primary keys with non-integer type', function(done) {
+      var User = this.sequelize.define('UserPKBT', { 
+        username: { 
+          type: Sequelize.STRING
+        }
+      })
+        , self = this
+
+      var Group = this.sequelize.define('GroupPKBT', { 
+        name: { 
+          type: Sequelize.STRING,
+          primaryKey: true
+        }
+      })
+
+      Group.hasOne(User)
+
+      self.sequelize.sync({ force: true }).success(function() {
+        expect(User.rawAttributes.GroupPKBTId.type.toString()).to.equal(Sequelize.STRING.toString())
+        done()
+      })
+    })
+  })
+
   describe("Association options", function() {
     it('can specify data type for autogenerated relational keys', function(done) {
       var User = this.sequelize.define('UserXYZ', { username: Sequelize.STRING })

test/dao-factory.test.js

@@ -1797,6 +1797,42 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
             })
           })
         })
+
+        it('eager loads with non-id primary keys', function(done) {
+          var self = this
+          self.User = self.sequelize.define('UserPKeagerbelong', { 
+            username: { 
+              type: Sequelize.STRING,
+              primaryKey: true
+            } 
+          })
+          self.Group = self.sequelize.define('GroupPKeagerbelong', { 
+            name: { 
+              type: Sequelize.STRING,
+              primaryKey: true
+            } 
+          })
+          self.User.belongsTo(self.Group)
+
+          self.sequelize.sync({ force: true }).success(function() {
+            self.User.create({ username: 'someone', GroupPKeagerbelongId: 'people' }).success(function() {
+              self.Group.create({ name: 'people' }).success(function() {
+                self.User.find({
+                   where: {
+                    username: 'someone'
+                  },
+                   include: [self.Group]
+                 }).complete(function (err, someUser) {
+                   expect(err).to.be.null
+                   expect(someUser).to.exist
+                   expect(someUser.username).to.equal('someone')
+                   expect(someUser.groupPKeagerbelong.name).to.equal('people')
+                   done()
+                 })
+              })
+            })
+          })
+        })
       })
 
       describe('hasOne', function() {
@@ -1830,6 +1866,42 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
             done()
           })
         })
+
+        it('eager loads with non-id primary keys', function(done) {
+          var self = this
+          self.User = self.sequelize.define('UserPKeagerone', { 
+            username: { 
+              type: Sequelize.STRING,
+              primaryKey: true
+            } 
+          })
+          self.Group = self.sequelize.define('GroupPKeagerone', { 
+            name: { 
+              type: Sequelize.STRING,
+              primaryKey: true
+            } 
+          })
+          self.Group.hasOne(self.User)
+
+          self.sequelize.sync({ force: true }).success(function() {
+            self.User.create({ username: 'someone', GroupPKeageroneId: 'people' }).success(function() {
+              self.Group.create({ name: 'people' }).success(function() {
+                self.Group.find({
+                   where: {
+                    name: 'people'
+                  },
+                   include: [self.User]
+                 }).complete(function (err, someGroup) {
+                   expect(err).to.be.null
+                   expect(someGroup).to.exist
+                   expect(someGroup.name).to.equal('people')
+                   expect(someGroup.userPKeagerone.username).to.equal('someone')
+                   done()
+                 })
+              })
+            })
+          })
+        })
       })
 
       describe('hasOne with alias', function() {
@@ -1916,6 +1988,46 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
             done()
           })
         })
+
+        it('eager loads with non-id primary keys', function(done) {
+          var self = this
+          self.User = self.sequelize.define('UserPKeagerone', { 
+            username: { 
+              type: Sequelize.STRING,
+              primaryKey: true
+            } 
+          })
+          self.Group = self.sequelize.define('GroupPKeagerone', { 
+            name: { 
+              type: Sequelize.STRING,
+              primaryKey: true
+            } 
+          })
+          self.Group.hasMany(self.User)
+          self.User.hasMany(self.Group)
+
+          self.sequelize.sync({ force: true }).success(function() {
+            self.User.create({ username: 'someone' }).success(function(someUser) {
+              self.Group.create({ name: 'people' }).success(function(someGroup) {
+                someUser.setGroupPKeagerones([someGroup]).complete(function (err, data) {
+                  expect(err).to.be.null
+                  self.User.find({
+                    where: {
+                      username: 'someone'
+                    },
+                    include: [self.Group]
+                  }).complete(function (err, someUser) {
+                    expect(err).to.be.null
+                    expect(someUser).to.exist
+                    expect(someUser.username).to.equal('someone')
+                    expect(someUser.groupPKeagerones[0].name).to.equal('people')
+                    done()
+                  })
+                }) 
+              })
+            })
+          })
+        })
       })
 
       describe('hasMany with alias', function() {