Merged master

changelog.md

@@ -17,7 +17,9 @@
 - [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] 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
 - [BUG] bulkCreate would have problems with a disparate field list [#738](https://github.com/sequelize/sequelize/pull/738). thanks to durango
+- [BUG] Fixed problems with quoteIdentifiers and {raw: false} option on raw queries [#751](https://github.com/sequelize/sequelize/pull/751). thanks to janmeier
 - [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] Foreign key constraints. [#595](https://github.com/sequelize/sequelize/pull/595). thanks to optilude

examples/enforce-referential-integrity/app.js

+/*jslint node:true */
+"use strict";
+
+var Sequelize = require('sequelize');
+
+// initialize database connection
+var sequelize = new Sequelize('testsequelize', 'testsequelize', 'testsequelize', {
+    dialect: 'postgres',
+    port: 5432,
+    define: {
+        freezeTableName: true
+    }
+});
+
+// load models
+var models = [
+    'Trainer',
+    'Series',
+    'Video'
+];
+
+models.forEach(function(model) {
+    module.exports[model] = sequelize.import(__dirname + '/' + model);
+});
+
+// describe relationships
+(function(m) {
+    m.Series.hasOne(m.Video);
+    m.Trainer.hasMany(m.Series);
+})(module.exports);
+
+// export connection
+module.exports.sequelize = sequelize;
\ No newline at end of file

examples/enforce-referential-integrity/models/Series.js

+/*jslint node:true */
+"use strict";
+
+module.exports = function(sequelize, DataTypes) {
+    return sequelize.define('Series', {
+        title: {
+            type: DataTypes.STRING
+        },
+        sub_title: {
+            type: DataTypes.STRING
+        },
+        description: {
+            type: DataTypes.TEXT
+        },
+        // Set FK relationship (hasMany) with `Trainer`
+        trainer_id: {
+            type: DataTypes.INTEGER,
+            references: "Trainer",
+            referencesKey: 'id'
+        }
+    }, {
+        // don't need timestamp attributes for this model
+        timestamps: false,
+        underscored: true
+    });
+};

examples/enforce-referential-integrity/models/Trainer.js

+/*jslint node:true */
+"use strict";
+
+module.exports = function(sequelize, DataTypes) {
+    return sequelize.define('Trainer', {
+        first_name: {
+            type: DataTypes.STRING
+        },
+        last_name: {
+            type: DataTypes.STRING
+        }
+    }, {
+        // don't need timestamp attributes for this model
+        timestamps: false,
+        underscored: true
+    });
+};

examples/enforce-referential-integrity/models/Video.js

+/*jslint node:true */
+"use strict";
+
+module.exports = function(sequelize, DataTypes) {
+    return sequelize.define('Video', {
+        title: {
+            type: DataTypes.STRING
+        },
+        sequence: {
+            type: DataTypes.INTEGER
+        },
+        description: {
+            type: DataTypes.TEXT
+        },
+        // set relationship (hasOne) with `Series`
+        series_id: {
+            type: DataTypes.INTEGER,
+            references: "Series",
+            referencesKey: 'id'
+        }
+    }, {
+        // don't need timestamp attributes for this model
+        timestamps: false,
+        underscored: true
+    });
+};

examples/enforce-referential-integrity/results.md

+Results after syncing the dabatase
+----------------------------------
+
+After syncing the database, you'll see in the console the following:
+
+```
+Executing: CREATE TABLE IF NOT EXISTS "Trainer" ("first_name" VARCHAR(255), "last_name" VARCHAR(255), "id"   SERIAL , PRIMARY KEY ("id"));
+Executing: CREATE TABLE IF NOT EXISTS "Series" ("title" VARCHAR(255), "sub_title" VARCHAR(255), "description" TEXT, "trainer_id" INTEGER REFERENCES "Trainer" ("id"), "id"   SERIAL , PRIMARY KEY ("id"));
+Executing: CREATE TABLE IF NOT EXISTS "Video" ("title" VARCHAR(255), "sequence" INTEGER, "description" TEXT, "series_id" INTEGER REFERENCES "Series" ("id"), "id"   SERIAL , PRIMARY KEY ("id"));
+```
+
+Notice in the `Video` that `series_id` field has a referential integrity to `Series`:
+
+```
+"series_id" INTEGER REFERENCES "Series" ("id")
+```
+
+This is the output when describing the table's structure of the Postgres database:
+
+**Trainer** table:
+```
+testsequelize=> \d+ "Trainer";
+                                                        Table "public.Trainer"
+   Column   |          Type          |                       Modifiers                        |
+------------+------------------------+--------------------------------------------------------+
+ first_name | character varying(255) |                                                        |
+ last_name  | character varying(255) |                                                        |
+ id         | integer                | not null default nextval('"Trainer_id_seq"'::regclass) |
+Indexes:
+    "Trainer_pkey" PRIMARY KEY, btree (id)
+Referenced by:
+    TABLE ""Series"" CONSTRAINT "Series_trainer_id_fkey" FOREIGN KEY (trainer_id) REFERENCES "Trainer"(id)
+Has OIDs: no
+```
+
+**Series** table:
+```
+testsequelize=> \d+ "Series";
+                                                          Table "public.Series"
+     Column      |          Type          |                       Modifiers                       |
+-----------------+------------------------+-------------------------------------------------------+
+ title           | character varying(255) |                                                       |
+ sub_title       | character varying(255) |                                                       |
+ description     | text                   |                                                       |
+ trainer_id      | integer                |                                                       |
+ id              | integer                | not null default nextval('"Series_id_seq"'::regclass) |
+Indexes:
+    "Series_pkey" PRIMARY KEY, btree (id)
+Foreign-key constraints:
+    "Series_trainer_id_fkey" FOREIGN KEY (trainer_id) REFERENCES "Trainer"(id)
+Referenced by:
+    TABLE ""Video"" CONSTRAINT "Video_series_id_fkey" FOREIGN KEY (series_id) REFERENCES "Series"(id)
+Has OIDs: no
+```
+
+**Video** table:
+```
+testsequelize=> \d+ "Video";
+                                                        Table "public.Video"
+   Column    |          Type          |                      Modifiers                       |
+-------------+------------------------+------------------------------------------------------+
+ title       | character varying(255) |                                                      |
+ sequence    | integer                |                                                      |
+ description | text                   |                                                      |
+ series_id   | integer                |                                                      |
+ id          | integer                | not null default nextval('"Video_id_seq"'::regclass) |
+Indexes:
+    "Video_pkey" PRIMARY KEY, btree (id)
+Foreign-key constraints:
+    "Video_series_id_fkey" FOREIGN KEY (series_id) REFERENCES "Series"(id)
+Has OIDs: no
+```

lib/dao-factory.js

@@ -278,6 +278,17 @@ module.exports = (function() {
 
       // whereCollection is used for non-primary key updates
       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

lib/dialects/postgres/query.js

@@ -111,7 +111,7 @@ module.exports = (function() {
       } else {
         // Postgres will treat tables as case-insensitive, so fix the case
         // of the returned values to match attributes
-        if(this.sequelize.options.quoteIdentifiers == false) {
+        if(this.options.raw === false && this.sequelize.options.quoteIdentifiers === false) {
           var attrsMap = Utils._.reduce(this.callee.attributes, function(m, v, k) { m[k.toLowerCase()] = k; return m}, {})
           rows.forEach(function(row) {
             Utils._.keys(row).forEach(function(key) {

spec/buster-helpers.js

@@ -34,7 +34,7 @@ var BusterHelpers = module.exports = {
     var sequelizeOptions = {
       logging: options.logging,
       dialect: options.dialect,
-      port:    config[options.dialect].port
+      port:    process.env.SEQ_PORT || config[options.dialect].port
     }
 
     if (process.env.DIALECT === 'postgres-native') {
@@ -42,9 +42,9 @@ var BusterHelpers = module.exports = {
     }
 
     return new Sequelize(
-      config[options.dialect].database,
-      config[options.dialect].username,
-      config[options.dialect].password,
+      process.env.SEQ_DB    || config[options.dialect].database,
+      process.env.SEQ_USER  || process.env.SEQ_USERNAME || config[options.dialect].username,
+      process.env.SEQ_PW    || process.env.SEQ_PASSWORD || config[options.dialect].password,
       sequelizeOptions
     )
   },

spec/dao-factory.spec.js

@@ -14,6 +14,7 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
     Helpers.initTests({
       dialect: dialect,
       beforeComplete: function(sequelize, DataTypes) {
+        this.DataTypes = DataTypes
         this.sequelize = sequelize
         this.User      = sequelize.define('User', {
           username:     DataTypes.STRING,
@@ -1077,11 +1078,36 @@ describe(Helpers.getTestDialectTeaser("DAOFactory"), function() {
       this.User.create({
         username: 'barfooz'
       }).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))
     })
 
+    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) {
       this.User.find(this.user.id).success(function(user) {
         expect(Array.isArray(user)).toBeFalsy()

spec/sequelize.spec.js

@@ -91,6 +91,22 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() {
       }.bind(this))
     })
 
+    it('executes select queries correctly when quoteIdentifiers is false', function(done) {
+      this.sequelize.options.quoteIdentifiers = false
+      this.sequelize.query(this.insertQuery).success(function() {
+        this.sequelize
+          .query("select * from " + qq(this.User.tableName) + "")
+          .complete(function(err, users) {
+            if (err) {
+              console.log(err)
+            }
+            expect(err).toBeNull()
+            expect(users.map(function(u){ return u.username })).toEqual(['john'])
+            done()
+          })
+      }.bind(this))
+    })
+
     it('executes select query and parses dot notation results', function(done) {
       this.sequelize.query(this.insertQuery).success(function() {
         this.sequelize