From a70a1b255aaa65dad8a7eb65bb21264e85a92668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Bajto=C5=A1?= <miroslav@strongloop.com>
Date: Thu, 26 Mar 2015 19:01:25 +0100
Subject: [PATCH] Code cleanup in updateAll/deleteAll

Rename the second callback argument to `info` to make its purpose more
clear. Fix jsdoc comments, note that these comments are NOT shown
on http://apidocs.strongloop.com/.
---
 lib/dao.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/dao.js b/lib/dao.js
index ce3cad70..cef7552d 100644
--- a/lib/dao.js
+++ b/lib/dao.js
@@ -1302,7 +1302,7 @@ DataAccessObject.findOne = function findOne(query, options, cb) {
  *
  * @param {Object} [where] Optional object that defines the criteria.  This is a "where" object. Do NOT pass a filter object.
  * @param {Object) [options] Options
- * @param {Function} [cb] Callback called with (err)
+ * @param {Function} [cb] Callback called with (err, info)
  */
 DataAccessObject.remove = DataAccessObject.deleteAll = DataAccessObject.destroyAll = function destroyAll(where, options, cb) {
   var connectionPromise = stillConnecting(this.getDataSource(), this, arguments);
@@ -1375,16 +1375,16 @@ DataAccessObject.remove = DataAccessObject.deleteAll = DataAccessObject.destroyA
 
     }
 
-    function done(err, data) {
+    function done(err, info) {
       if (err) return cb(err);
 
       if (options.notify === false) {
-        return cb(err, data);
+        return cb(err, info);
       }
 
       var context = { Model: Model, where: where, hookState: hookState };
       Model.notifyObserversOf('after delete', context, function(err) {
-        cb(err, data);
+        cb(err, info);
         if (!err)
           Model.emit('deletedAll', whereIsEmpty(where) ? undefined : where);
       });
@@ -1631,7 +1631,7 @@ DataAccessObject.prototype.save = function (options, cb) {
  * @param {Object} [where] Search conditions (optional)
  * @param {Object} data Changes to be made
  * @param {Object} [options] Options for update
- * @param {Function} cb Callback, called with (err, count)
+ * @param {Function} cb Callback, called with (err, info)
  */
 DataAccessObject.update =
 DataAccessObject.updateAll = function (where, data, options, cb) {
@@ -1710,13 +1710,13 @@ DataAccessObject.updateAll = function (where, data, options, cb) {
     }
 
     var connector = Model.getDataSource().connector;
-    connector.update(Model.modelName, where, data, function(err, count) {
+    connector.update(Model.modelName, where, data, function(err, info) {
       if (err) return cb (err);
       var context = {
         Model: Model, where: where, data: data, hookState: hookState
       };
       Model.notifyObserversOf('after save', context, function(err, ctx) {
-          return cb(err, count);
+          return cb(err, info);
         });
     });
   }