Strings for .find() should be fixed. Also added support for string primary keys …

…to be found easily. Closes #735

changelog.md

@@ -17,6 +17,7 @@
 - [BUG] PostgreSQL should now be able to insert empty arrays with typecasting. [#718](https://github.com/sequelize/sequelize/pull/718). thanks to durango
 - [BUG] PostgreSQL should now be able to insert empty arrays with typecasting. [#718](https://github.com/sequelize/sequelize/pull/718). thanks to durango
 - [BUG] Fields should be escaped by quoteIdentifier for max/min functions which allows SQL reserved keywords to be used. [#719](https://github.com/sequelize/sequelize/pull/719). thanks to durango
 - [BUG] Fields should be escaped by quoteIdentifier for max/min functions which allows SQL reserved keywords to be used. [#719](https://github.com/sequelize/sequelize/pull/719). thanks to durango
 - [BUG] Fixed bug when trying to save objects with eagerly loaded attributes [#716](https://github.com/sequelize/sequelize/pull/716). thanks to iamjochen
 - [BUG] Fixed bug when trying to save objects with eagerly loaded attributes [#716](https://github.com/sequelize/sequelize/pull/716). thanks to iamjochen
+- [BUG] Strings for .find() should be fixed. Also added support for string primary keys to be found easily. [#737](https://github.com/sequelize/sequelize/pull/737). thanks to durango
 - [FEATURE] Validate a model before it gets saved. [#601](https://github.com/sequelize/sequelize/pull/601). thanks to durango
 - [FEATURE] Validate a model before it gets saved. [#601](https://github.com/sequelize/sequelize/pull/601). thanks to durango
 - [FEATURE] Schematics. [#564](https://github.com/sequelize/sequelize/pull/564). thanks to durango
 - [FEATURE] Schematics. [#564](https://github.com/sequelize/sequelize/pull/564). thanks to durango
 - [FEATURE] Foreign key constraints. [#595](https://github.com/sequelize/sequelize/pull/595). thanks to optilude
 - [FEATURE] Foreign key constraints. [#595](https://github.com/sequelize/sequelize/pull/595). thanks to optilude

lib/dao-factory.js

@@ -278,6 +278,17 @@ module.exports = (function() {
 
 
       // whereCollection is used for non-primary key updates
       // whereCollection is used for non-primary key updates
       this.options.whereCollection = options.where || null
       this.options.whereCollection = options.where || null
+    } else if (typeof options === "string") {
+      var where = {}
+        , keys = Object.keys(primaryKeys)
+
+      if (this.primaryKeyCount === 1) {
+        where[primaryKeys[keys[0]]] = options;
+        options = where;
+      } else if (this.primaryKeyCount < 1) {
+        // Revert to default behavior which is {where: [int]}
+        options = {where: parseInt(Number(options) || 0, 0)}
+      }
     }
     }
 
 
     options.limit = 1
     options.limit = 1

spec/dao-factory.spec.js

@@ -14,6 +14,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
     Helpers.initTests({
     Helpers.initTests({
       dialect: dialect,
       dialect: dialect,
       beforeComplete: function(sequelize, DataTypes) {
       beforeComplete: function(sequelize, DataTypes) {
+        this.DataTypes = DataTypes
         this.sequelize = sequelize
         this.sequelize = sequelize
         this.User      = sequelize.define('User', {
         this.User      = sequelize.define('User', {
           username:     DataTypes.STRING,
           username:     DataTypes.STRING,
@@ -1060,11 +1061,36 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
       this.User.create({
       this.User.create({
         username: 'barfooz'
         username: 'barfooz'
       }).success(function(user) {
       }).success(function(user) {
-        this.user = user
-        done()
+        this.UserPrimary = this.sequelize.define('UserPrimary', {
+          specialKey: {
+            type: this.DataTypes.STRING,
+            primaryKey: true
+          }
+        })
+
+        this.UserPrimary.sync({force: true}).success(function(primary){
+          this.UserPrimary.create({specialKey: 'a string'}).success(function(){
+            this.user = user
+            done()
+          }.bind(this))
+        }.bind(this))
       }.bind(this))
       }.bind(this))
     })
     })
 
 
+    it('doesn\'t throw an error when entering in a non integer value for a specified primary field', function(done) {
+      this.UserPrimary.find('a string').success(function(user) {
+        expect(user.specialKey).toEqual('a string')
+        done()
+      })
+    })
+
+    it('doesn\'t throw an error when entering in a non integer value', function(done) {
+      this.User.find('a string value').success(function(user) {
+        expect(user).toBeNull()
+        done()
+      })
+    })
+
     it('returns a single dao', function(done) {
     it('returns a single dao', function(done) {
       this.User.find(this.user.id).success(function(user) {
       this.User.find(this.user.id).success(function(user) {
         expect(Array.isArray(user)).toBeFalsy()
         expect(Array.isArray(user)).toBeFalsy()