Merge pull request #899 from hackwaly/master

fix the bug `findAndCountAll` not working on postgresql.

lib/utils.js

@@ -55,7 +55,7 @@ var Utils = module.exports = {
   },
   },
   format: function(arr, dialect) {
   format: function(arr, dialect) {
     var timeZone = null;
     var timeZone = null;
-    return SqlString.format(arr.shift(), arr, timeZone, dialect)
+    return SqlString.format(arr[0], arr.slice(1), timeZone, dialect)
   },
   },
   formatNamedParameters: function(sql, parameters, dialect) {
   formatNamedParameters: function(sql, parameters, dialect) {
     var timeZone = null;
     var timeZone = null;

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) {
     it('allows sql logging', function(done) {
       this.User.count().on('sql', function(sql) {
       this.User.count().on('sql', function(sql) {
         expect(sql).to.exist
         expect(sql).to.exist