diff options
| author | HumairAK <humair88@hotmail.com> | 2016-07-22 02:46:20 +0000 |
|---|---|---|
| committer | HumairAK <humair88@hotmail.com> | 2016-07-22 02:46:20 +0000 |
| commit | 5c5dc252311ddc47dbd6ea49f24bddeb9990f5fe (patch) | |
| tree | 472063fcd490f54883d2ea9d0e6aa7e4f8009707 /node_modules/mongodb/lib/db.js | |
| parent | 0653dcc395a54c8c95ed4f997ff9bbf02ea60b5e (diff) | |
| parent | 21b3b50f84e7c4c4d30f2e5c73a444a0288e1c5d (diff) | |
Merge branch 'master' of https://github.com/HumairAK/solutions_repo
Diffstat (limited to 'node_modules/mongodb/lib/db.js')
| -rw-r--r-- | node_modules/mongodb/lib/db.js | 7 |
1 files changed, 4 insertions, 3 deletions
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) { |
