mongodb 3.1.6 → 3.1.10

package/HISTORY.md

@@ -2,6 +2,62 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="3.1.10"></a>
+## [3.1.10](https://github.com/mongodb/node-mongodb-native/compare/v3.1.9...v3.1.10) (2018-11-16)
+
+
+### Bug Fixes
+
+* **auth:** remember to default to admin database ([c7dec28](https://github.com/mongodb/node-mongodb-native/commit/c7dec28))
+
+
+### Features
+
+* **core:** update to mongodb-core v3.1.9 ([bd3355b](https://github.com/mongodb/node-mongodb-native/commit/bd3355b))
+
+
+
+<a name="3.1.9"></a>
+## [3.1.9](https://github.com/mongodb/node-mongodb-native/compare/v3.1.8...v3.1.9) (2018-11-06)
+
+
+### Bug Fixes
+
+* **db:** move db constants to other file to avoid circular ref ([#1858](https://github.com/mongodb/node-mongodb-native/issues/1858)) ([239036f](https://github.com/mongodb/node-mongodb-native/commit/239036f))
+* **estimated-document-count:** support options other than maxTimeMs ([36c3c7d](https://github.com/mongodb/node-mongodb-native/commit/36c3c7d))
+
+
+### Features
+
+* **core:** update to mongodb-core v3.1.8 ([80d7c79](https://github.com/mongodb/node-mongodb-native/commit/80d7c79))
+
+
+
+<a name="3.1.8"></a>
+## [3.1.8](https://github.com/mongodb/node-mongodb-native/compare/v3.1.7...v3.1.8) (2018-10-10)
+
+
+### Bug Fixes
+
+* **connect:** use reported default databse from new uri parser ([811f8f8](https://github.com/mongodb/node-mongodb-native/commit/811f8f8))
+
+
+### Features
+
+* **core:** update to mongodb-core v3.1.7 ([dbfc905](https://github.com/mongodb/node-mongodb-native/commit/dbfc905))
+
+
+
+<a name="3.1.7"></a>
+## [3.1.7](https://github.com/mongodb/node-mongodb-native/compare/v3.1.6...v3.1.7) (2018-10-09)
+
+
+### Features
+
+* **core:** update mongodb-core to v3.1.6 ([61b054e](https://github.com/mongodb/node-mongodb-native/commit/61b054e))
+
+
+
 <a name="3.1.6"></a>
 ## [3.1.6](https://github.com/mongodb/node-mongodb-native/compare/v3.1.5...v3.1.6) (2018-09-15)
 

package/README.md

@@ -211,7 +211,7 @@ The application should print **Connected successfully to server** to the console
 ### Insert a Document
 
 Add to **app.js** the following function which uses the **insertMany**
-method to add three documents to the **documents** collection.  
+method to add three documents to the **documents** collection.
 
 ```js
 const insertDocuments = function(db, callback) {
@@ -354,7 +354,7 @@ const updateDocument = function(db, callback) {
     assert.equal(1, result.result.n);
     console.log("Updated the document with the field a equal to 2");
     callback(result);
-  });  
+  });
 }
 ```
 
@@ -399,7 +399,7 @@ const removeDocument = function(db, callback) {
     assert.equal(1, result.result.n);
     console.log("Removed the document with the field a equal to 3");
     callback(result);
-  });    
+  });
 }
 ```
 
@@ -484,3 +484,10 @@ For more detailed information, see the [tutorials](docs/reference/content/tutori
  * [MongoDB Documentation](http://mongodb.org)
  * [Read about Schemas](http://learnmongodbthehardway.com)
  * [Star us on GitHub](https://github.com/mongodb/node-mongodb-native)
+
+## License
+
+[Apache 2.0](LICENSE.md)
+
+© 2009-2012 Christian Amor Kvalheim  
+© 2012-present MongoDB [Contributors](CONTRIBUTORS.md)

package/lib/collection.js

@@ -9,6 +9,7 @@ const MongoError = require('mongodb-core').MongoError;
 const toError = require('./utils').toError;
 const normalizeHintField = require('./utils').normalizeHintField;
 const handleCallback = require('./utils').handleCallback;
+const decorateCommand = require('./utils').decorateCommand;
 const decorateWithCollation = require('./utils').decorateWithCollation;
 const decorateWithReadConcern = require('./utils').decorateWithReadConcern;
 const formattedOrderClause = require('./utils').formattedOrderClause;
@@ -390,12 +391,7 @@ Collection.prototype.find = deprecateOptions(
     // Translate to new command option noCursorTimeout
     if (typeof newOptions.timeout === 'boolean') newOptions.noCursorTimeout = newOptions.timeout;
 
-    // Merge in options to command
-    for (let name in newOptions) {
-      if (newOptions[name] != null && name !== 'session') {
-        findCommand[name] = newOptions[name];
-      }
-    }
+    decorateCommand(findCommand, newOptions, ['session', 'collation']);
 
     if (projection) findCommand.fields = projection;
 
@@ -424,7 +420,12 @@ Collection.prototype.find = deprecateOptions(
     decorateWithReadConcern(findCommand, this, options);
 
     // Decorate find command with collation options
-    decorateWithCollation(findCommand, this, options);
+    try {
+      decorateWithCollation(findCommand, this, options);
+    } catch (err) {
+      if (typeof callback === 'function') return callback(err, null);
+      throw err;
+    }
 
     const cursor = this.s.topology.cursor(this.s.namespace, findCommand, newOptions);
 
@@ -677,7 +678,7 @@ Collection.prototype.insert = deprecate(function(docs, options, callback) {
 
 /**
  * @typedef {Object} Collection~updateWriteOpResult
- * @property {Object} result The raw result returned from MongoDB, field will vary depending on server version.
+ * @property {Object} result The raw result returned from MongoDB. Will vary depending on server version.
  * @property {Number} result.ok Is 1 if the command executed correctly.
  * @property {Number} result.n The total count of documents scanned.
  * @property {Number} result.nModified The total count of documents modified.
@@ -687,6 +688,8 @@ Collection.prototype.insert = deprecate(function(docs, options, callback) {
  * @property {Number} upsertedCount The number of documents upserted.
  * @property {Object} upsertedId The upserted id.
  * @property {ObjectId} upsertedId._id The upserted _id returned from the server.
+ * @property {Object} message
+ * @property {Array} ops
  */
 
 /**
@@ -697,7 +700,7 @@ Collection.prototype.insert = deprecate(function(docs, options, callback) {
  */
 
 /**
- * Update a single document on MongoDB
+ * Update a single document in a collection
  * @method
  * @param {object} filter The Filter used to select the document to update
  * @param {object} update The update operations to be applied to the document
@@ -734,9 +737,9 @@ Collection.prototype.updateOne = function(filter, update, options, callback) {
 };
 
 /**
- * Replace a document on MongoDB
+ * Replace a document in a collection with another document
  * @method
- * @param {object} filter The Filter used to select the document to update
+ * @param {object} filter The Filter used to select the document to replace
  * @param {object} doc The Document that replaces the matching document
  * @param {object} [options] Optional settings.
  * @param {boolean} [options.upsert=false] Update operation is an upsert.
@@ -746,7 +749,7 @@ Collection.prototype.updateOne = function(filter, update, options, callback) {
  * @param {boolean} [options.bypassDocumentValidation=false] Allow driver to bypass schema validation in MongoDB 3.2 or higher.
  * @param {ClientSession} [options.session] optional session to use for this operation
  * @param {Collection~updateWriteOpCallback} [callback] The command result callback
- * @return {Promise} returns Promise if no callback passed
+ * @return {Promise<Collection~updatewriteOpResultObject>} returns Promise if no callback passed
  */
 Collection.prototype.replaceOne = function(filter, doc, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
@@ -762,10 +765,10 @@ Collection.prototype.replaceOne = function(filter, doc, options, callback) {
 };
 
 /**
- * Update multiple documents on MongoDB
+ * Update multiple documents in a collection
  * @method
  * @param {object} filter The Filter used to select the documents to update
- * @param {object} update The update operations to be applied to the document
+ * @param {object} update The update operations to be applied to the documents
  * @param {object} [options] Optional settings.
  * @param {boolean} [options.upsert=false] Update operation is an upsert.
  * @param {(number|string)} [options.w] The write concern.
@@ -774,7 +777,7 @@ Collection.prototype.replaceOne = function(filter, doc, options, callback) {
  * @param {Array} [options.arrayFilters] optional list of array filters referenced in filtered positional operators
  * @param {ClientSession} [options.session] optional session to use for this operation
  * @param {Collection~updateWriteOpCallback} [callback] The command result callback
- * @return {Promise} returns Promise if no callback passed
+ * @return {Promise<Collection~updateWriteOpResultObject>} returns Promise if no callback passed
  */
 Collection.prototype.updateMany = function(filter, update, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
@@ -838,7 +841,7 @@ Collection.prototype.update = deprecate(function(selector, document, options, ca
 
 /**
  * @typedef {Object} Collection~deleteWriteOpResult
- * @property {Object} result The raw result returned from MongoDB, field will vary depending on server version.
+ * @property {Object} result The raw result returned from MongoDB. Will vary depending on server version.
  * @property {Number} result.ok Is 1 if the command executed correctly.
  * @property {Number} result.n The total count of documents deleted.
  * @property {Object} connection The connection object used for the operation.
@@ -853,7 +856,7 @@ Collection.prototype.update = deprecate(function(selector, document, options, ca
  */
 
 /**
- * Delete a document on MongoDB
+ * Delete a document from a collection
  * @method
  * @param {object} filter The Filter used to select the document to remove
  * @param {object} [options] Optional settings.
@@ -880,7 +883,7 @@ Collection.prototype.deleteOne = function(filter, options, callback) {
 Collection.prototype.removeOne = Collection.prototype.deleteOne;
 
 /**
- * Delete multiple documents on MongoDB
+ * Delete multiple documents from a collection
  * @method
  * @param {object} filter The Filter used to select the documents to remove
  * @param {object} [options] Optional settings.
@@ -1386,8 +1389,6 @@ Collection.prototype.estimatedDocumentCount = function(options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
 
-  options = typeof options.maxTimeMS === 'number' ? options : {};
-
   return executeOperation(this.s.topology, count, [this, null, options, callback]);
 };
 
@@ -1507,17 +1508,17 @@ Collection.prototype.stats = function(options, callback) {
  */
 
 /**
- * Find a document and delete it in one atomic operation, requires a write lock for the duration of the operation.
+ * Find a document and delete it in one atomic operation. Requires a write lock for the duration of the operation.
  *
  * @method
- * @param {object} filter Document selection filter.
+ * @param {object} filter The Filter used to select the document to remove
  * @param {object} [options] Optional settings.
  * @param {object} [options.projection] Limits the fields to return for all matching documents.
  * @param {object} [options.sort] Determines which document the operation modifies if the query selects multiple documents.
  * @param {number} [options.maxTimeMS] The maximum amount of time to allow the query to run.
  * @param {ClientSession} [options.session] optional session to use for this operation
  * @param {Collection~findAndModifyCallback} [callback] The collection result callback
- * @return {Promise} returns Promise if no callback passed
+ * @return {Promise<Collection~findAndModifyWriteOpResultObject>} returns Promise if no callback passed
  */
 Collection.prototype.findOneAndDelete = function(filter, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
@@ -1531,11 +1532,11 @@ Collection.prototype.findOneAndDelete = function(filter, options, callback) {
 };
 
 /**
- * Find a document and replace it in one atomic operation, requires a write lock for the duration of the operation.
+ * Find a document and replace it in one atomic operation. Requires a write lock for the duration of the operation.
  *
  * @method
- * @param {object} filter Document selection filter.
- * @param {object} replacement Document replacing the matching document.
+ * @param {object} filter The Filter used to select the document to replace
+ * @param {object} replacement The Document that replaces the matching document
  * @param {object} [options] Optional settings.
  * @param {object} [options.projection] Limits the fields to return for all matching documents.
  * @param {object} [options.sort] Determines which document the operation modifies if the query selects multiple documents.
@@ -1544,7 +1545,7 @@ Collection.prototype.findOneAndDelete = function(filter, options, callback) {
  * @param {boolean} [options.returnOriginal=true] When false, returns the updated document rather than the original. The default is true.
  * @param {ClientSession} [options.session] optional session to use for this operation
  * @param {Collection~findAndModifyCallback} [callback] The collection result callback
- * @return {Promise} returns Promise if no callback passed
+ * @return {Promise<Collection~findAndModifyWriteOpResultObject>} returns Promise if no callback passed
  */
 Collection.prototype.findOneAndReplace = function(filter, replacement, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
@@ -1566,10 +1567,10 @@ Collection.prototype.findOneAndReplace = function(filter, replacement, options,
 };
 
 /**
- * Find a document and update it in one atomic operation, requires a write lock for the duration of the operation.
+ * Find a document and update it in one atomic operation. Requires a write lock for the duration of the operation.
  *
  * @method
- * @param {object} filter Document selection filter.
+ * @param {object} filter The Filter used to select the document to update
  * @param {object} update Update operations to be performed on the document
  * @param {object} [options] Optional settings.
  * @param {object} [options.projection] Limits the fields to return for all matching documents.
@@ -1580,7 +1581,7 @@ Collection.prototype.findOneAndReplace = function(filter, replacement, options,
  * @param {ClientSession} [options.session] optional session to use for this operation
  * @param {Array} [options.arrayFilters] optional list of array filters referenced in filtered positional operators
  * @param {Collection~findAndModifyCallback} [callback] The collection result callback
- * @return {Promise} returns Promise if no callback passed
+ * @return {Promise<Collection~findAndModifyWriteOpResultObject>} returns Promise if no callback passed
  */
 Collection.prototype.findOneAndUpdate = function(filter, update, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
@@ -1756,7 +1757,12 @@ Collection.prototype.aggregate = function(pipeline, options, callback) {
   }
 
   // Have we specified collation
-  decorateWithCollation(command, this, options);
+  try {
+    decorateWithCollation(command, this, options);
+  } catch (err) {
+    if (typeof callback === 'function') return callback(err, null);
+    throw err;
+  }
 
   // If we have bypassDocumentValidation set
   if (options.bypassDocumentValidation === true) {

package/lib/constants.js

@@ -0,0 +1,10 @@
+'use strict';
+
+module.exports = {
+  SYSTEM_NAMESPACE_COLLECTION: 'system.namespaces',
+  SYSTEM_INDEX_COLLECTION: 'system.indexes',
+  SYSTEM_PROFILE_COLLECTION: 'system.profile',
+  SYSTEM_USER_COLLECTION: 'system.users',
+  SYSTEM_COMMAND_COLLECTION: '$cmd',
+  SYSTEM_JS_COLLECTION: 'system.js'
+};

package/lib/db.js

@@ -19,6 +19,7 @@ const resolveReadPreference = require('./utils').resolveReadPreference;
 const ChangeStream = require('./change_stream');
 const deprecate = require('util').deprecate;
 const deprecateOptions = require('./utils').deprecateOptions;
+const CONSTANTS = require('./constants');
 
 // Operations
 const addUser = require('./operations/db_ops').addUser;
@@ -532,7 +533,7 @@ Db.prototype.listCollections = function(filter, options) {
   // Return options
   const _options = { transforms: listCollectionsTransforms(this.s.databaseName) };
   // Get the cursor
-  cursor = this.collection(Db.SYSTEM_NAMESPACE_COLLECTION).find(filter, _options);
+  cursor = this.collection(CONSTANTS.SYSTEM_NAMESPACE_COLLECTION).find(filter, _options);
   // Do we have a readPreference, apply it
   if (options.readPreference) cursor.setReadPreference(options.readPreference);
   // Set the passed in batch size if one was provided
@@ -974,11 +975,11 @@ Db.prototype.getLogger = function() {
  */
 
 // Constants
-Db.SYSTEM_NAMESPACE_COLLECTION = 'system.namespaces';
-Db.SYSTEM_INDEX_COLLECTION = 'system.indexes';
-Db.SYSTEM_PROFILE_COLLECTION = 'system.profile';
-Db.SYSTEM_USER_COLLECTION = 'system.users';
-Db.SYSTEM_COMMAND_COLLECTION = '$cmd';
-Db.SYSTEM_JS_COLLECTION = 'system.js';
+Db.SYSTEM_NAMESPACE_COLLECTION = CONSTANTS.SYSTEM_NAMESPACE_COLLECTION;
+Db.SYSTEM_INDEX_COLLECTION = CONSTANTS.SYSTEM_INDEX_COLLECTION;
+Db.SYSTEM_PROFILE_COLLECTION = CONSTANTS.SYSTEM_PROFILE_COLLECTION;
+Db.SYSTEM_USER_COLLECTION = CONSTANTS.SYSTEM_USER_COLLECTION;
+Db.SYSTEM_COMMAND_COLLECTION = CONSTANTS.SYSTEM_COMMAND_COLLECTION;
+Db.SYSTEM_JS_COLLECTION = CONSTANTS.SYSTEM_JS_COLLECTION;
 
 module.exports = Db;

package/lib/gridfs-stream/upload.js

@@ -277,7 +277,7 @@ function checkDone(_this, callback) {
       return false;
     }
 
-    _this.files.insert(filesDoc, getWriteOptions(_this), function(error) {
+    _this.files.insertOne(filesDoc, getWriteOptions(_this), function(error) {
       if (error) {
         return __handleError(_this, error, callback);
       }
@@ -430,7 +430,7 @@ function doWrite(_this, chunk, encoding, callback) {
         return false;
       }
 
-      _this.chunks.insert(doc, getWriteOptions(_this), function(error) {
+      _this.chunks.insertOne(doc, getWriteOptions(_this), function(error) {
         if (error) {
           return __handleError(_this, error);
         }
@@ -514,7 +514,7 @@ function writeRemnant(_this, callback) {
     return false;
   }
 
-  _this.chunks.insert(doc, getWriteOptions(_this), function(error) {
+  _this.chunks.insertOne(doc, getWriteOptions(_this), function(error) {
     if (error) {
       return __handleError(_this, error);
     }

package/lib/mongo_client.js

@@ -109,7 +109,7 @@ const validOptions = require('./operations/mongo_client_ops').validOptions;
  * @param {boolean} [options.auto_reconnect=true] Enable auto reconnecting for single server instances
  * @param {boolean} [options.monitorCommands=false] Enable command monitoring for this client
  * @param {number} [options.minSize] If present, the connection pool will be initialized with minSize connections, and will never dip below minSize connections
- * @param {boolean} [options.useNewUrlParser=false] Determines whether or not to use the new url parser
+ * @param {boolean} [options.useNewUrlParser=false] Determines whether or not to use the new url parser. Enables the new, spec-compliant, url parser shipped in the core driver. This url parser fixes a number of problems with the original parser, and aims to outright replace that parser in the near future.
  * @param {MongoClient~connectCallback} [callback] The command result callback
  * @return {MongoClient} a MongoClient instance
  */

package/lib/operations/collection_ops.js

@@ -181,7 +181,12 @@ function count(coll, query, options, callback) {
     collection: coll
   });
 
-  const cmd = buildCountCommand(coll, query, options);
+  let cmd;
+  try {
+    cmd = buildCountCommand(coll, query, options);
+  } catch (err) {
+    return callback(err);
+  }
 
   executeCommand(coll.s.db, cmd, options, (err, result) => {
     if (err) return handleCallback(callback, err);
@@ -390,7 +395,11 @@ function distinct(coll, key, query, options, callback) {
   decorateWithReadConcern(cmd, coll, options);
 
   // Have we specified collation
-  decorateWithCollation(cmd, coll, options);
+  try {
+    decorateWithCollation(cmd, coll, options);
+  } catch (err) {
+    return callback(err, null);
+  }
 
   // Execute the command
   executeCommand(coll.s.db, cmd, options, (err, result) => {
@@ -521,7 +530,11 @@ function findAndModify(coll, query, sort, doc, options, callback) {
   finalOptions.readPreference = ReadPreference.primary;
 
   // Have we specified collation
-  decorateWithCollation(queryObject, coll, finalOptions);
+  try {
+    decorateWithCollation(queryObject, coll, finalOptions);
+  } catch (err) {
+    return callback(err, null);
+  }
 
   // Execute the command
   executeCommand(coll.s.db, queryObject, finalOptions, (err, result) => {
@@ -651,7 +664,7 @@ function geoHaystackSearch(coll, x, y, options, callback) {
   };
 
   // Remove read preference from hash if it exists
-  commandObject = decorateCommand(commandObject, options, { readPreference: true, session: true });
+  commandObject = decorateCommand(commandObject, options, ['readPreference', 'session']);
 
   options = Object.assign({}, options);
   // Ensure we have the right read preference inheritance
@@ -721,7 +734,11 @@ function group(coll, keys, condition, initial, reduce, finalize, command, option
     decorateWithReadConcern(selector, coll, options);
 
     // Have we specified collation
-    decorateWithCollation(selector, coll, options);
+    try {
+      decorateWithCollation(selector, coll, options);
+    } catch (err) {
+      return callback(err, null);
+    }
 
     // Execute command
     executeCommand(coll.s.db, selector, options, (err, result) => {
@@ -933,7 +950,11 @@ function mapReduce(coll, map, reduce, options, callback) {
   }
 
   // Have we specified collation
-  decorateWithCollation(mapCommandHash, coll, options);
+  try {
+    decorateWithCollation(mapCommandHash, coll, options);
+  } catch (err) {
+    return callback(err, null);
+  }
 
   // Execute command
   executeCommand(coll.s.db, mapCommandHash, options, (err, result) => {
@@ -1154,7 +1175,11 @@ function removeDocuments(coll, selector, options, callback) {
   }
 
   // Have we specified collation
-  decorateWithCollation(finalOptions, coll, options);
+  try {
+    decorateWithCollation(finalOptions, coll, options);
+  } catch (err) {
+    return callback(err, null);
+  }
 
   // Execute the remove
   coll.s.topology.remove(coll.s.namespace, [op], finalOptions, (err, result) => {
@@ -1358,7 +1383,11 @@ function updateDocuments(coll, selector, document, options, callback) {
   }
 
   // Have we specified collation
-  decorateWithCollation(finalOptions, coll, options);
+  try {
+    decorateWithCollation(finalOptions, coll, options);
+  } catch (err) {
+    return callback(err, null);
+  }
 
   // Update options
   coll.s.topology.update(coll.s.namespace, [op], finalOptions, (err, result) => {

package/lib/operations/cursor_ops.js

@@ -44,7 +44,12 @@ function count(cursor, applySkipLimit, opts, callback) {
   const delimiter = cursor.s.ns.indexOf('.');
   options.collectionName = cursor.s.ns.substr(delimiter + 1);
 
-  const command = buildCountCommand(cursor, cursor.s.cmd.query, options);
+  let command;
+  try {
+    command = buildCountCommand(cursor, cursor.s.cmd.query, options);
+  } catch (err) {
+    return callback(err);
+  }
 
   // Set cursor server to the same as the topology
   cursor.server = cursor.topology.s.coreTopology;

package/lib/operations/db_ops.js

@@ -4,13 +4,13 @@ const applyWriteConcern = require('../utils').applyWriteConcern;
 const Code = require('mongodb-core').BSON.Code;
 const resolveReadPreference = require('../utils').resolveReadPreference;
 const crypto = require('crypto');
-const Db = require('../db');
 const debugOptions = require('../utils').debugOptions;
 const handleCallback = require('../utils').handleCallback;
 const MongoError = require('mongodb-core').MongoError;
 const parseIndexOptions = require('../utils').parseIndexOptions;
 const ReadPreference = require('mongodb-core').ReadPreference;
 const toError = require('../utils').toError;
+const CONSTANTS = require('../constants');
 
 const count = require('./collection_ops').count;
 const findOne = require('./collection_ops').findOne;
@@ -64,6 +64,8 @@ const illegalCommandFields = [
  * @param {Db~resultCallback} [callback] The command result callback
  */
 function addUser(db, username, password, options, callback) {
+  const Db = require('../db');
+
   // Did the user destroy the topology
   if (db.serverConfig && db.serverConfig.isDestroyed())
     return callback(new MongoError('topology was destroyed'));
@@ -83,7 +85,7 @@ function addUser(db, username, password, options, callback) {
       const db = options.dbName ? new Db(options.dbName, db.s.topology, db.s.options) : db;
 
       // Fetch a user collection
-      const collection = db.collection(Db.SYSTEM_USER_COLLECTION);
+      const collection = db.collection(CONSTANTS.SYSTEM_USER_COLLECTION);
 
       // Check if we are inserting the first user
       count(collection, {}, finalOptions, (err, count) => {
@@ -296,7 +298,7 @@ function createIndex(db, name, fieldOrSpec, options, callback) {
     finalOptions.checkKeys = false;
     // Insert document
     db.s.topology.insert(
-      `${db.s.databaseName}.${Db.SYSTEM_INDEX_COLLECTION}`,
+      `${db.s.databaseName}.${CONSTANTS.SYSTEM_INDEX_COLLECTION}`,
       doc,
       finalOptions,
       (err, result) => {
@@ -630,6 +632,8 @@ function profilingLevel(db, options, callback) {
  * @param {Db~resultCallback} [callback] The command result callback
  */
 function removeUser(db, username, options, callback) {
+  const Db = require('../db');
+
   // Attempt to execute command
   executeAuthRemoveUserCommand(db, username, options, (err, result) => {
     if (err && err.code === -5000) {
@@ -638,7 +642,7 @@ function removeUser(db, username, options, callback) {
       const db = options.dbName ? new Db(options.dbName, db.s.topology, db.s.options) : db;
 
       // Fetch a user collection
-      const collection = db.collection(Db.SYSTEM_USER_COLLECTION);
+      const collection = db.collection(CONSTANTS.SYSTEM_USER_COLLECTION);
 
       // Locate the user
       findOne(collection, { user: username }, finalOptions, (err, user) => {

package/lib/operations/mongo_client_ops.js

@@ -555,23 +555,33 @@ function transformUrlOptions(_object) {
         object[i] = auth[i];
       }
     }
+
     if (auth.username) {
       object.auth = auth;
       object.user = auth.username;
     }
+
     if (auth.db) {
-      object.dbName = auth.db;
+      object.authSource = object.authSource || auth.db;
     }
   }
+
+  if (_object.defaultDatabase) {
+    object.dbName = _object.defaultDatabase;
+  }
+
   if (object.maxpoolsize) {
     object.poolSize = object.maxpoolsize;
   }
+
   if (object.readconcernlevel) {
     object.readConcern = { level: object.readconcernlevel };
   }
+
   if (object.wtimeoutms) {
     object.wtimeout = object.wtimeoutms;
   }
+
   return object;
 }
 

package/lib/utils.js

@@ -254,7 +254,7 @@ var debugOptions = function(debugFields, options) {
 
 var decorateCommand = function(command, options, exclude) {
   for (var name in options) {
-    if (exclude[name] == null) command[name] = options[name];
+    if (exclude.indexOf(name) === -1) command[name] = options[name];
   }
 
   return command;
@@ -588,12 +588,12 @@ function decorateWithCollation(command, target, options) {
     throw new TypeError('parameter "target" is missing a topology');
   }
 
-  // Do we support collation 3.4 and higher
   const capabilities = target.s.topology.capabilities();
-  // Do we support write concerns 3.4 and higher
-  if (capabilities && capabilities.commandsTakeCollation) {
-    if (options.collation && typeof options.collation === 'object') {
+  if (options.collation && typeof options.collation === 'object') {
+    if (capabilities && capabilities.commandsTakeCollation) {
       command.collation = options.collation;
+    } else {
+      throw new MongoError(`server ${topology.s.coreTopology.name} does not support collation`);
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "3.1.6",
+  "version": "3.1.10",
   "description": "The official MongoDB driver for Node.js",
   "main": "index.js",
   "files": [
@@ -17,7 +17,7 @@
     "official"
   ],
   "dependencies": {
-    "mongodb-core": "3.1.5",
+    "mongodb-core": "3.1.9",
     "safe-buffer": "^5.1.2"
   },
   "devDependencies": {
@@ -43,7 +43,6 @@
     "standard-version": "^4.4.0",
     "worker-farm": "^1.5.0"
   },
-  "author": "Christian Kvalheim",
   "license": "Apache-2.0",
   "engines": {
     "node": ">=4"