Merge pull request #530 from aheckmann/error

Fix empty MongoError "message" property

Makefile

@@ -1,6 +1,6 @@
 NODE = node
 NPM = npm
-NODEUNIT = deps/nodeunit/bin/nodeunit
+NODEUNIT = node_modules/nodeunit/bin/nodeunit
 DOX = node_modules/dox/bin/dox
 name = all
 

lib/mongodb/db.js

@@ -1566,7 +1566,8 @@ Db.prototype._executeRemoveCommand = Db.prototype._executeInsertCommand;
  * @api private
  */
 Db.prototype.wrap = function(error) {
-  var e = new Error(error.err != null ? error.err : error.errmsg);
+  var msg = error.err || error.errmsg || error;
+  var e = new Error(msg);
   e.name = 'MongoError';
 
   // Get all object keys

test/error_test.js

@@ -289,6 +289,22 @@ exports.shouldHandleAssertionError = function(test) {
     });
   }); 
 }
+
+exports['mixing included and excluded fields should return an error object with message'] = function (test) {
+  client.createCollection('test_error_object_should_include_message', function(err, c) {
+    test.equal(err, null);
+    c.insert({a:2, b: 5}, {safe:true}, function(err, r) {
+      test.equal(err, null);
+      c.findOne({a:2}, {fields: {a:1, b:0}}, function(err) {
+        test.ok(err);
+        test.equal('object', typeof err);
+        var rgx = /You cannot currently mix including and excluding fields/;
+        test.ok(rgx.test(err.message), 'missing error message property');
+        test.done();
+      });
+    });
+  });
+}
 
 /**
  * Retrieve the server information for the current