Merge branch 'master' into milestones/2.0.0

Conflicts:
	lib/dao-factory.js

changelog.md

@@ -36,10 +36,12 @@
 - [BUG] Fixed eager loading for many-to-many associations. [#834](https://github.com/sequelize/sequelize/pull/834). thanks to lemon-tree
 - [BUG] allowNull: true enums can now be null [#857](https://github.com/sequelize/sequelize/pull/857). thanks to durango
 - [BUG] Fixes Postgres' ability to search within arrays. [#879](https://github.com/sequelize/sequelize/pull/879). thanks to durango
-- [BUG] Find and finAll would modify the options objects, now the objects are cloned at the start of the method [#884](https://github.com/sequelize/sequelize/pull/884) thanks to janmeier
+- [BUG] Find and finAll would modify the options objects, now the objects are cloned at the start of the method [#884](https://github.com/sequelize/sequelize/pull/884) thanks to janmeier. Improved in [#899](https://github.com/sequelize/sequelize/pull/899) thanks to hackwaly
 - [BUG] Add support for typed arrays in SqlString.escape and SqlString.arrayToList [#891](https://github.com/sequelize/sequelize/pull/891). thanks to LJ1102
 - [BUG] Postgres requires empty array to be explicitly cast on update [#890](https://github.com/sequelize/sequelize/pull/890). thanks to robraux
 - [BUG] Added tests & bugfixes for DAO-Factory.update and array of values in where clause [#880](https://github.com/sequelize/sequelize/pull/880). thanks to domasx2
+- [BUG] sqlite no longer leaks a global `db` variable [#900](https://github.com/sequelize/sequelize/pull/900). thanks to xming
+- [BUG] Fix for counts queries with no result [#906](https://github.com/sequelize/sequelize/pull/906). thanks to iamjochem
 - [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

lib/dao-factory.js

@@ -326,7 +326,6 @@ module.exports = (function() {
     var hasJoin = false
 
     options = optClone(options)
-
     if (typeof options === 'object') {
       if (options.hasOwnProperty('include')) {
         hasJoin = true
@@ -379,7 +378,6 @@ module.exports = (function() {
     var primaryKeys = this.primaryKeys
       , keys        = Object.keys(primaryKeys)
       , keysLength  = keys.length
-    options = optClone(options)
 
     // options is not a hash but an id
     if (typeof options === 'number') {
@@ -669,7 +667,7 @@ module.exports = (function() {
   DAOFactory.prototype.update = function(attrValueHash, where, options) {
     options = options || {}
     options.validate = options.validate === undefined ? true : Boolean(options.validate)
-    
+
     if(this.options.timestamps) {
       var attr = Utils._.underscoredIf(this.options.updatedAt, this.options.underscored)
       attrValueHash[attr] = Utils.now()

lib/dao-validator.js

@@ -58,7 +58,7 @@ var validateModel = function() {
 }
 
 var validateAttributes = function() {
-  var self = this
+  var self   = this
     , errors = {}
 
   // for each field and value

lib/dialects/sqlite/connector-manager.js

@@ -18,6 +18,7 @@ module.exports = (function() {
   ConnectorManager.prototype.connect = function() {
     var emitter = new (require('events').EventEmitter)()
       , self = this
+      , db
 
     this.database = db = new sqlite3.Database(self.sequelize.options.storage || ':memory:', function(err) {
       if (err) {

lib/query-interface.js

@@ -581,10 +581,10 @@ module.exports = (function() {
 
       qry
         .success(function(data) {
-          var result = data[attributeSelector]
+          var result = data ? data[attributeSelector] : null
 
           if (options && options.parseInt) {
-            result = parseInt(result)
+            result = parseInt(result, 10)
           }
 
           if (options && options.parseFloat) {

lib/utils.js

@@ -55,7 +55,8 @@ var Utils = module.exports = {
   },
   format: function(arr, dialect) {
     var timeZone = null;
-    return SqlString.format(arr.shift(), arr, timeZone, dialect)
+    // Make a clone of the array beacuse format modifies the passed args
+    return SqlString.format(arr[0], arr.slice(1), timeZone, dialect)
   },
   formatNamedParameters: function(sql, parameters, dialect) {
     var timeZone = null;

package.json

@@ -36,11 +36,11 @@
     "url": "https://github.com/sequelize/sequelize/issues"
   },
   "dependencies": {
-    "lodash": "~1.3.1",
+    "lodash": "~2.0.0",
     "underscore.string": "~2.3.0",
     "lingo": "~0.0.5",
     "validator": "~1.5.0",
-    "moment": "~2.1.0",
+    "moment": "~2.2.1",
     "commander": "~2.0.0",
     "dottie": "0.0.8-0",
     "toposort-class": "~0.2.0",
@@ -55,7 +55,7 @@
     "watchr": "~2.4.3",
     "yuidocjs": "~0.3.36",
     "chai": "~1.7.2",
-    "mocha": "~1.12.0",
+    "mocha": "~1.13.0",
     "chai-datetime": "~1.1.1",
     "sinon": "~1.7.3"
   },
@@ -77,4 +77,4 @@
     "node": ">=0.4.6"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}

test/dao-factory.test.js

@@ -2752,6 +2752,15 @@ describe(Support.getTestDialectTeaser("DAOFactory"), function () {
       })
     })
 
+    it('does not modify the passed arguments', function (done) {
+      var options = { where: ['username = ?', 'user1']}
+
+      this.User.count(options).success(function(count) {
+        expect(options).to.deep.equal({ where: ['username = ?', 'user1']})
+        done()
+      })
+    })
+
     it('allows sql logging', function(done) {
       this.User.count().on('sql', function(sql) {
         expect(sql).to.exist

test/dao.validations.test.js

@@ -261,6 +261,34 @@ describe(Support.getTestDialectTeaser("DaoValidator"), function() {
     }
 
     describe('#update', function() {
+      it('should allow us to update specific columns without tripping the validations', function(done) {
+        var User = this.sequelize.define('model', {
+          username: Sequelize.STRING,
+          email: {
+            type: Sequelize.STRING,
+            allowNull: false,
+            validate: {
+              isEmail: {
+                msg: 'You must enter a valid email address'
+              }
+            }
+          }
+        })
+
+        User.sync({ force: true }).success(function() {
+          User.create({username: 'bob', email: 'hello@world.com'}).success(function(user) {
+            User.update({username: 'toni'}, {id: user.id})
+            .error(function(err) { console.log(err) })
+            .success(function() {
+              User.find(1).success(function(user) {
+                expect(user.username).to.equal('toni')
+                done()
+              })
+            })
+          })
+        })
+      })
+
       it('should be able to emit an error upon updating when a validation has failed from an instance', function(done) {
         var Model = this.sequelize.define('model', {
           name: {