Cleanup in 830

lib/dao-factory.js

@@ -354,15 +354,8 @@ module.exports = (function() {
 
 
   DAOFactory.prototype.findAndCountAll = function(options) {
   DAOFactory.prototype.findAndCountAll = function(options) {
     var self  = this
     var self  = this
-      , opts  = Utils._.cloneDeep(options)
-      , copts = Utils._.extend({}, Utils._.cloneDeep(options) || {}, {
-          // no limit, offset, order, attributes or include for the options given to count()
-          offset   : 0,
-          limit    : 0,
-          order    : null,
-          include  : null,
-          attributes: []
-      })
+      // no limit, offset, order, attributes or include for the options given to count()
+      , copts = Utils._.omit(options || {}, ['offset', 'limit', 'order', 'include', 'attributes'])
 
 
     return new Utils.CustomEventEmitter(function (emitter) {
     return new Utils.CustomEventEmitter(function (emitter) {
       var emit = {
       var emit = {
@@ -378,20 +371,21 @@ module.exports = (function() {
         , sql  : function(s) {        // emit SQL
         , sql  : function(s) {        // emit SQL
             emitter.emit('sql', s);
             emitter.emit('sql', s);
           }
           }
-      }
+        }
 
 
       self.count(copts)
       self.count(copts)
           .on('sql', emit.sql)
           .on('sql', emit.sql)
           .error(emit.err)
           .error(emit.err)
           .success(function(cnt) {
           .success(function(cnt) {
-            if (cnt === 0)
+            if (cnt === 0) {
               return emit.okay(cnt) // no records, no need for another query
               return emit.okay(cnt) // no records, no need for another query
+            }
 
 
             self.findAll(options)
             self.findAll(options)
                 .on('sql', emit.sql)
                 .on('sql', emit.sql)
                 .error(emit.err)
                 .error(emit.err)
                 .success(function(rows) {
                 .success(function(rows) {
-                   emit.okay(cnt, rows)
+                  emit.okay(cnt, rows)
                 })
                 })
           })
           })