Merge branch 'ghernandez345-master'

lib/dao-factory.js

@@ -140,7 +140,15 @@ module.exports = (function() {
       })
       })
 
 
       options = { where: where }
       options = { where: where }
-    } else if((typeof options === 'object') && (options.hasOwnProperty('include'))) {
+    } 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
       var includes = options.include
       hasJoin = true;
       hasJoin = true;
 
 

spec/dao-factory.spec.js

@@ -300,6 +300,15 @@ describe("[" + dialect.toUpperCase() + "] DAOFactory", function() {
       }.bind(this))
       }.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) {
     it("should make aliased attributes available", function(done) {
       this.User.find({
       this.User.find({
         where: { id: 1 },
         where: { id: 1 },