Merge branch 'master' of git://github.com/ghernandez345/sequelize into ghernandez345-master

lib/dao-factory.js

@@ -127,7 +127,14 @@ module.exports = (function() {
     var primaryKeys = this.primaryKeys;
     var primaryKeys = this.primaryKeys;
 
 
     // options is not a hash but an id
     // options is not a hash but an id
-    if(typeof options === 'number') {
+    if(typeof options === 'string') {
+      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 === 'number') {
       options = { where: options }
       options = { where: options }
     } else if (Utils._.size(primaryKeys) && Utils.argsArePrimaryKeys(arguments, primaryKeys)) {
     } else if (Utils._.size(primaryKeys) && Utils.argsArePrimaryKeys(arguments, primaryKeys)) {
         var where = {}
         var where = {}

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 },