returning update document at the end of the callback for update docs,…

… (Issue #569)

HISTORY

@@ -5,6 +5,7 @@
 - Corrupt GridFS files when chunkSize < fileSize, fixed concurrency issue (Issue #555)
 - Handle dead tailable cursors (Issue #568, https://github.com/aheckmann)
 - Connection pools handles closing themselves down and clearing the state
+- Check bson size of documents against maxBsonSize and throw client error instead of server error, (Issue #553)
 
 0.9.9.7 2012-03-16
 ------------------

lib/mongodb/collection.js

@@ -419,13 +419,14 @@ Collection.prototype.update = function update(selector, document, options, callb
     this.db._executeUpdateCommand(updateCommand, commandOptions, function (err, error) {
       error = error && error.documents;
       if(!callback) return;      
-      
+
       if(err) {
         callback(err);
       } else if(error[0].err || error[0].errmsg) {
         callback(self.db.wrap(error[0]));
       } else {
-        callback(null, error[0].n);
+        // Perform the callback
+        callback(null, error[0].n, error[0]);
       }      
     });    
   } else {

test/insert_test.js

@@ -1151,6 +1151,29 @@ exports.shouldFailDueToInsertBeingBiggerThanMaxDocumentSizeAllowed = function(te
   });  
 }
 
+/**
+ * @ignore
+ */
+exports.shouldCorrectlyPerformUpsertAgainstNewDocumentAndExistingOne = function(test) {
+  client.createCollection('shouldCorrectlyPerformUpsertAgainstNewDocumentAndExistingOne', function(err, collection) {
+    // Upsert a new doc
+    collection.update({a:1}, {a:1}, {upsert:true, safe:true}, function(err, result, status) {
+      test.equal(1, result);
+      test.equal(false, status.updatedExisting);
+      test.equal(1, status.n);
+      test.ok(status.upserted != null);      
+
+      // Upsert an existing doc
+      collection.update({a:1}, {a:1}, {upsert:true, safe:true}, function(err, result, status) {
+        test.equal(1, result);
+        test.equal(true, status.updatedExisting);
+        test.equal(1, status.n);
+        test.done();
+      });
+    });
+  });    
+}
+
 /**
  * Retrieve the server information for the current
  * instance of the db client