ensure promoteBuffers is propegated in same fashion as promoteValues and promoteLongs

Author: christkv

lib/collection.js

@@ -66,7 +66,8 @@ var Collection = function(db, topology, dbName, name, pkFactory, options) {
   var serializeFunctions = options == null || options.serializeFunctions == null ? db.s.options.serializeFunctions : options.serializeFunctions;
   var raw = options == null || options.raw == null ? db.s.options.raw : options.raw;
   var promoteLongs = options == null || options.promoteLongs == null ? db.s.options.promoteLongs : options.promoteLongs;
-  var promoteValues = options == null || options.raw == promoteValues ? db.s.options.promoteValues : options.promoteValues;
+  var promoteValues = options == null || options.promoteValues == null ? db.s.options.promoteValues : options.promoteValues;
+  var promoteBuffers = options == null || options.promoteBuffers == null ? db.s.options.promoteBuffers : options.promoteBuffers;
   var readPreference = null;
   var collectionHint = null;
   var namespace = f("%s.%s", dbName, name);
@@ -118,6 +119,8 @@ var Collection = function(db, topology, dbName, name, pkFactory, options) {
     , promoteLongs: promoteLongs
     // promoteValues
     , promoteValues: promoteValues
+    // promoteBuffers
+    , promoteBuffers: promoteBuffers
     // internalHint
     , internalHint: internalHint
     // collectionHint
@@ -351,6 +354,7 @@ Collection.prototype.find = function() {
   // Set promoteLongs if available at collection level
   if(newOptions.promoteLongs == null && typeof this.s.promoteLongs == 'boolean') newOptions.promoteLongs = this.s.promoteLongs;
   if(newOptions.promoteValues == null && typeof this.s.promoteValues == 'boolean') newOptions.promoteValues = this.s.promoteValues;
+  if(newOptions.promoteBuffers == null && typeof this.s.promoteBuffers == 'boolean') newOptions.promoteBuffers = this.s.promoteBuffers;
 
   // Sort options
   if(findCommand.sort) {
@@ -1364,6 +1368,7 @@ define.classMethod('save', {callback: true, promise:true});
  * @param {boolean} [options.raw=false] Return document results as raw BSON buffers.
  * @param {boolean} [options.promoteLongs=true] Promotes Long values to number if they fit inside the 53 bits resolution.
  * @param {boolean} [options.promoteValues=true] Promotes BSON values to native types where possible, set to false to only receive wrapper types.
+ * @param {boolean} [options.promoteBuffers=false] Promotes Binary BSON values to native Node Buffers.
  * @param {(ReadPreference|string)} [options.readPreference=null] The preferred read preference (ReadPreference.PRIMARY, ReadPreference.PRIMARY_PREFERRED, ReadPreference.SECONDARY, ReadPreference.SECONDARY_PREFERRED, ReadPreference.NEAREST).
  * @param {boolean} [options.partial=false] Specify if the cursor should return partial results when querying against a sharded system
  * @param {number} [options.maxTimeMS=null] Number of miliseconds to wait before aborting the query.
@@ -2558,6 +2563,7 @@ function decorateWithCollation(command, self, options) {
  * @param {boolean} [options.raw=false] Return document results as raw BSON buffers.
  * @param {boolean} [options.promoteLongs=true] Promotes Long values to number if they fit inside the 53 bits resolution.
  * @param {boolean} [options.promoteValues=true] Promotes BSON values to native types where possible, set to false to only receive wrapper types.
+ * @param {boolean} [options.promoteBuffers=false] Promotes Binary BSON values to native Node Buffers.
  * @param {Collection~resultCallback} callback The command result callback
  * @return {(null|AggregationCursor)}
  */

lib/db.js

@@ -24,7 +24,7 @@ var EventEmitter = require('events').EventEmitter
   , assign = require('./utils').assign;
 
 var debugFields = ['authSource', 'w', 'wtimeout', 'j', 'native_parser', 'forceServerObjectId'
-  , 'serializeFunctions', 'raw', 'promoteLongs', 'promoteValues', 'bufferMaxEntries', 'numberOfRetries', 'retryMiliSeconds'
+  , 'serializeFunctions', 'raw', 'promoteLongs', 'promoteValues', 'promoteBuffers', 'bufferMaxEntries', 'numberOfRetries', 'retryMiliSeconds'
   , 'readPreference', 'pkFactory', 'parentDb', 'promiseLibrary', 'noListener'];
 
 /**
@@ -47,7 +47,7 @@ var debugFields = ['authSource', 'w', 'wtimeout', 'j', 'native_parser', 'forceSe
 var legalOptionNames = ['w', 'wtimeout', 'fsync', 'j', 'readPreference', 'readPreferenceTags', 'native_parser'
   , 'forceServerObjectId', 'pkFactory', 'serializeFunctions', 'raw', 'bufferMaxEntries', 'authSource'
   , 'ignoreUndefined', 'promoteLongs', 'promiseLibrary', 'readConcern', 'retryMiliSeconds', 'numberOfRetries'
-  , 'parentDb', 'noListener', 'loggerLevel', 'logger'];
+  , 'parentDb', 'noListener', 'loggerLevel', 'logger', 'promoteBuffers', 'promoteLongs', 'promoteValues'];
 
 /**
  * Creates a new Db instance
@@ -64,6 +64,7 @@ var legalOptionNames = ['w', 'wtimeout', 'fsync', 'j', 'readPreference', 'readPr
  * @param {Boolean} [options.ignoreUndefined=false] Specify if the BSON serializer should ignore undefined fields.
  * @param {boolean} [options.raw=false] Return document results as raw BSON buffers.
  * @param {boolean} [options.promoteLongs=true] Promotes Long values to number if they fit inside the 53 bits resolution.
+ * @param {boolean} [options.promoteBuffers=false] Promotes Binary BSON values to native Node Buffers.
  * @param {boolean} [options.promoteValues=true] Promotes BSON values to native types where possible, set to false to only receive wrapper types.
  * @param {number} [options.bufferMaxEntries=-1] Sets a cap on how many operations the driver will buffer up before giving up on getting a working connection, default is -1 which is unlimited.
  * @param {(ReadPreference|string)} [options.readPreference=null] The preferred read preference (ReadPreference.PRIMARY, ReadPreference.PRIMARY_PREFERRED, ReadPreference.SECONDARY, ReadPreference.SECONDARY_PREFERRED, ReadPreference.NEAREST).

lib/mongos.js

@@ -54,7 +54,7 @@ var release = os.release();
    , 'store', 'auto_reconnect', 'autoReconnect', 'emitError'
    , 'keepAlive', 'noDelay', 'connectTimeoutMS', 'socketTimeoutMS'
    , 'loggerLevel', 'logger', 'reconnectTries', 'appname', 'domainsEnabled'
-   , 'servername', 'promoteLongs', 'promoteValues'];
+   , 'servername', 'promoteLongs', 'promoteValues', 'promoteBuffers'];
 
 /**
  * Creates a new Mongos instance

lib/replset.js

@@ -49,7 +49,7 @@ var legalOptionNames = ['ha', 'haInterval', 'replicaSet', 'rs_name', 'secondaryA
   , 'store', 'auto_reconnect', 'autoReconnect', 'emitError'
   , 'keepAlive', 'noDelay', 'connectTimeoutMS', 'socketTimeoutMS', 'strategy', 'debug'
   , 'loggerLevel', 'logger', 'reconnectTries', 'appname', 'domainsEnabled'
-  , 'servername', 'promoteLongs', 'promoteValues'];
+  , 'servername', 'promoteLongs', 'promoteValues', 'promoteBuffers'];
 
 // Get package.json variable
 var driverVersion = require(__dirname + '/../package.json').version;

lib/server.js

@@ -51,7 +51,7 @@ var release = os.release();
    , 'keepAlive', 'noDelay', 'connectTimeoutMS', 'socketTimeoutMS'
    , 'loggerLevel', 'logger', 'reconnectTries', 'reconnectInterval', 'monitoring'
    , 'appname', 'domainsEnabled'
-   , 'servername', 'promoteLongs', 'promoteValues'];
+   , 'servername', 'promoteLongs', 'promoteValues', 'promoteBuffers'];
 
 /**
  * Creates a new Server instance

test/runner.js

@@ -301,6 +301,7 @@ var testFiles = [
   , '/test/functional/hang_tests.js',
   , '/test/functional/disconnect_handler_tests.js',
   , '/test/functional/promote_values_tests.js',
+  , '/test/functional/promote_buffers_tests.js',
 
   // Replicaset tests
   , '/test/functional/replset_read_preference_tests.js'