mongodb 2.2.29 → 2.2.30

package/HISTORY.md

@@ -1,3 +1,11 @@
+2.2.30 2017-07-07
+-----------------
+* Update mongodb-core to 2.2.14
+* MongoClient
+  * add `appname` to list of valid option names
+  * added test for passing appname as option
+* NODE-1052 ensure user options are applied while parsing connection string uris
+
 2.2.29 2017-06-19
 -----------------
 * Update mongodb-core to 2.1.13

package/lib/mongo_client.js

@@ -38,7 +38,7 @@ var validOptionNames = ['poolSize', 'ssl', 'sslValidate', 'sslCA', 'sslCert',
   'serializeFunctions', 'ignoreUndefined', 'raw', 'promoteLongs', 'bufferMaxEntries',
   'readPreference', 'pkFactory', 'promiseLibrary', 'readConcern', 'maxStalenessSeconds',
   'loggerLevel', 'logger', 'promoteValues', 'promoteBuffers', 'promoteLongs',
-  'domainsEnabled', 'keepAliveInitialDelay', 'checkServerIdentity', 'validateOptions'];
+  'domainsEnabled', 'keepAliveInitialDelay', 'checkServerIdentity', 'validateOptions', 'appname'];
 var ignoreOptionNames = ['native_parser'];
 var legacyOptionNames = ['server', 'replset', 'replSet', 'mongos', 'db'];
 
@@ -132,6 +132,7 @@ function MongoClient() {
    * @param {object} [options.readConcern=null] Specify a read concern for the collection. (only MongoDB 3.2 or higher supported)
    * @param {string} [options.readConcern.level='local'] Specify a read concern level for the collection operations, one of [local|majority]. (only MongoDB 3.2 or higher supported)
    * @param {number} [options.maxStalenessSeconds=undefined] The max staleness to secondary reads (values under 10 seconds cannot be guaranteed);
+   * @param {string} [options.appname=undefined] The name of the application that created this MongoClient instance. MongoDB 3.4 and newer will print this value in the server log upon establishing each connection. It is also recorded in the slow query log and profile collections.
    * @param {string} [options.loggerLevel=undefined] The logging level (error/warn/info/debug)
    * @param {object} [options.logger=undefined] Custom logger object
    * @param {object} [options.validateOptions=false] Validate MongoClient passed in options for correctness.
@@ -200,6 +201,7 @@ var define = MongoClient.define = new Define('MongoClient', MongoClient, false);
  * @param {object} [options.readConcern=null] Specify a read concern for the collection. (only MongoDB 3.2 or higher supported)
  * @param {string} [options.readConcern.level='local'] Specify a read concern level for the collection operations, one of [local|majority]. (only MongoDB 3.2 or higher supported)
  * @param {number} [options.maxStalenessSeconds=undefined] The max staleness to secondary reads (values under 10 seconds cannot be guaranteed);
+ * @param {string} [options.appname=undefined] The name of the application that created this MongoClient instance. MongoDB 3.4 and newer will print this value in the server log upon establishing each connection. It is also recorded in the slow query log and profile collections.
  * @param {string} [options.loggerLevel=undefined] The logging level (error/warn/info/debug)
  * @param {object} [options.logger=undefined] Custom logger object
  * @param {object} [options.validateOptions=false] Validate MongoClient passed in options for correctness.

package/lib/url_parser.js

@@ -2,9 +2,10 @@
 
 var ReadPreference = require('./read_preference'),
   parser = require('url'),
-  f = require('util').format;
+  f = require('util').format,
+  assign = require('./utils').assign;
 
-module.exports = function(url) {
+module.exports = function(url, options) {
   // Variables
   var connection_part = '';
   var auth_part = '';
@@ -398,8 +399,12 @@ module.exports = function(url) {
     dbOptions.readPreference = 'primary';
   }
 
+  // make sure that user-provided options are applied with priority
+  dbOptions = assign(dbOptions, options);
+
   // Add servers to result
   object.servers = servers;
+
   // Returned parsed object
   return object;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "2.2.29",
+  "version": "2.2.30",
   "description": "The official MongoDB driver for Node.js",
   "main": "index.js",
   "repository": {
@@ -14,7 +14,7 @@
   ],
   "dependencies": {
     "es6-promise": "3.2.1",
-    "mongodb-core": "2.1.13",
+    "mongodb-core": "2.1.14",
     "readable-stream": "2.2.7"
   },
   "devDependencies": {