Merge pull request #796 from durango/cap-id

You can now use .find() on any single integer primary key when throwing just a number as an argument. Closes #68

lib/dao-factory.js

@@ -250,14 +250,21 @@ module.exports = (function() {
     }
     }
 
 
     var primaryKeys = this.primaryKeys
     var primaryKeys = this.primaryKeys
+      , keys = Object.keys(primaryKeys)
+      , keysLength = keys.length
 
 
     // options is not a hash but an id
     // options is not a hash but an id
     if (typeof options === 'number') {
     if (typeof options === 'number') {
-      options = { where: options }
+      var oldOption = options
+      options = { where: {} }
+      if (keysLength === 1) {
+        options.where[keys[0]] = oldOption
+      } else {
+        options.where.id = oldOption
+      }
     } else if (Utils._.size(primaryKeys) && Utils.argsArePrimaryKeys(arguments, primaryKeys)) {
     } else if (Utils._.size(primaryKeys) && Utils.argsArePrimaryKeys(arguments, primaryKeys)) {
       var where = {}
       var where = {}
         , self  = this
         , self  = this
-        , keys = Object.keys(primaryKeys)
 
 
       Utils._.each(arguments, function(arg, i) {
       Utils._.each(arguments, function(arg, i) {
         var key = keys[i]
         var key = keys[i]

test/dao-factory.test.js

@@ -1392,17 +1392,34 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
             {where: {id: 0}},
             {where: {id: 0}},
             {where: {id: '0'}}
             {where: {id: '0'}}
           ]
           ]
-          , done = _.after(2 * permutations.length, _done);
+          , done = _.after(2 * permutations.length, _done)
 
 
         this.User.bulkCreate([{username: 'jack'}, {username: 'jack'}]).success(function() {
         this.User.bulkCreate([{username: 'jack'}, {username: 'jack'}]).success(function() {
           permutations.forEach(function(perm) {
           permutations.forEach(function(perm) {
             self.User.find(perm).done(function(err, user) {
             self.User.find(perm).done(function(err, user) {
-              expect(err).to.be.null;
-              expect(user).to.be.null;
-              done();
+              expect(err).to.be.null
+              expect(user).to.be.null
+              done()
             }).on('sql', function(s) {
             }).on('sql', function(s) {
-              expect(s.indexOf(0)).not.to.equal(-1);
-              done();
+              expect(s.indexOf(0)).not.to.equal(-1)
+              done()
+            })
+          })
+        })
+      })
+
+      it('should allow us to find IDs using capital letters', function(done) {
+        var User = this.sequelize.define('User' + config.rand(), {
+          ID: { type: Sequelize.INTEGER, primaryKey: true, autoIncrement: true },
+          Login: { type: Sequelize.STRING }
+        })
+
+        User.sync({ force: true }).success(function() {
+          User.create({Login: 'foo'}).success(function() {
+            User.find(1).success(function(user) {
+              expect(user).to.exist
+              expect(user.ID).to.equal(1)
+              done()
             })
             })
           })
           })
         })
         })
@@ -2115,6 +2132,23 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
           })
           })
         })
         })
       })
       })
+
+      it('should allow us to find IDs using capital letters', function(done) {
+        var User = this.sequelize.define('User' + config.rand(), {
+          ID: { type: Sequelize.INTEGER, primaryKey: true, autoIncrement: true },
+          Login: { type: Sequelize.STRING }
+        })
+
+        User.sync({ force: true }).success(function() {
+          User.create({Login: 'foo'}).success(function() {
+            User.findAll({ID: 1}).success(function(user) {
+              expect(user).to.be.instanceof(Array)
+              expect(user).to.have.length(1)
+              done()
+            })
+          })
+        })
+      })
     })
     })
   })
   })