Merge branch 'ghernandez345-master'

lib/dao-factory.js

@@ -130,17 +130,25 @@ module.exports = (function() {
     if(typeof options === 'number') {
       options = { where: options }
     } else if (Utils._.size(primaryKeys) && Utils.argsArePrimaryKeys(arguments, primaryKeys)) {
-        var where = {}
-          , self  = this
-          , keys = Utils._.keys(primaryKeys)
+      var where = {}
+        , self  = this
+        , keys = Utils._.keys(primaryKeys)
 
-        Utils._.each(arguments, function(arg, i) {
-          var key = keys[i]
-          where[key] = arg
-        })
+      Utils._.each(arguments, function(arg, i) {
+        var key = keys[i]
+        where[key] = arg
+      })
 
-        options = { where: where }
-    } else if((typeof options === 'object') && (options.hasOwnProperty('include'))) {
+      options = { where: where }
+    } else if ((typeof options === 'string') && (parseInt(options, 10).toString() === options)) {
+      var parsedId = parseInt(options, 10);
+
+      if(!Utils._.isFinite(parsedId)) {
+        throw new Error('Invalid argument to find(). Must be an id or an options object.')
+      }
+
+      options = { where: parsedId }
+    } else if ((typeof options === 'object') && (options.hasOwnProperty('include'))) {
       var includes = options.include
       hasJoin = true;
 
@@ -178,7 +186,7 @@ module.exports = (function() {
 
     return this.QueryInterface.rawSelect(this.tableName, options, 'min')
   }
-  
+
   DAOFactory.prototype.build = function(values, options) {
     var instance = new DAO(values, Utils._.extend(this.options, { hasPrimaryKeys: this.hasPrimaryKeys, factory: this }))
       , self     = this

spec/dao-factory.spec.js

@@ -300,6 +300,15 @@ describe("[" + dialect.toUpperCase() + "] DAOFactory", function() {
       }.bind(this))
     })
 
+    it('returns a single dao given a string id', function(done) {
+      this.User.find(this.user.id + '').success(function(user) {
+        expect(Array.isArray(user)).toBeFalsy()
+        expect(user.id).toEqual(this.user.id)
+        expect(user.id).toEqual(1)
+        done()
+      }.bind(this))
+    })
+
     it("should make aliased attributes available", function(done) {
       this.User.find({
         where: { id: 1 },