From dc3888553bdda4ee30e6440992459916cec8d911 Mon Sep 17 00:00:00 2001 From: nanalelfe Date: Thu, 21 Jul 2016 19:25:55 -0400 Subject: Need pull --- node_modules/mongodb/lib/db.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'node_modules/mongodb/lib/db.js') diff --git a/node_modules/mongodb/lib/db.js b/node_modules/mongodb/lib/db.js index d53cee8..a51ca0b 100644 --- a/node_modules/mongodb/lib/db.js +++ b/node_modules/mongodb/lib/db.js @@ -20,7 +20,8 @@ var EventEmitter = require('events').EventEmitter , Define = require('./metadata') , Logger = require('mongodb-core').Logger , Collection = require('./collection') - , crypto = require('crypto'); + , crypto = require('crypto') + , assign = require('./utils').assign; var debugFields = ['authSource', 'w', 'wtimeout', 'j', 'native_parser', 'forceServerObjectId' , 'serializeFunctions', 'raw', 'promoteLongs', 'bufferMaxEntries', 'numberOfRetries', 'retryMiliSeconds' @@ -804,7 +805,7 @@ Db.prototype.dropCollection = function(name, options, callback) { var cmd = {'drop':name} // options - options = Object.assign({}, this.s.options, {readPreference: ReadPreference.PRIMARY}); + options = assign({}, this.s.options, {readPreference: ReadPreference.PRIMARY}); // Check if the callback is in fact a string if(typeof callback == 'function') return this.command(cmd, options, function(err, result) { @@ -847,7 +848,7 @@ Db.prototype.dropDatabase = function(callback) { // Drop database command var cmd = {'dropDatabase':1}; // Ensure primary only - var options = Object.assign({}, this.s.options, {readPreference: ReadPreference.PRIMARY}); + var options = assign({}, this.s.options, {readPreference: ReadPreference.PRIMARY}); // Check if the callback is in fact a string if(typeof callback == 'function') return this.command(cmd, options, function(err, result) { -- cgit v1.2.3