mongodb 3.0.6 → 3.0.7

package/lib/db.js

@@ -1,27 +1,27 @@
 'use strict';
 
-var EventEmitter = require('events').EventEmitter,
-  inherits = require('util').inherits,
-  getSingleProperty = require('./utils').getSingleProperty,
-  shallowClone = require('./utils').shallowClone,
-  parseIndexOptions = require('./utils').parseIndexOptions,
-  debugOptions = require('./utils').debugOptions,
-  CommandCursor = require('./command_cursor'),
-  handleCallback = require('./utils').handleCallback,
-  filterOptions = require('./utils').filterOptions,
-  toError = require('./utils').toError,
-  ReadPreference = require('mongodb-core').ReadPreference,
-  f = require('util').format,
-  Admin = require('./admin'),
-  Code = require('mongodb-core').BSON.Code,
-  MongoError = require('mongodb-core').MongoError,
-  ObjectID = require('mongodb-core').ObjectID,
-  Define = require('./metadata'),
-  Logger = require('mongodb-core').Logger,
-  Collection = require('./collection'),
-  crypto = require('crypto'),
-  mergeOptionsAndWriteConcern = require('./utils').mergeOptionsAndWriteConcern,
-  executeOperation = require('./utils').executeOperation;
+const EventEmitter = require('events').EventEmitter;
+const inherits = require('util').inherits;
+const getSingleProperty = require('./utils').getSingleProperty;
+const shallowClone = require('./utils').shallowClone;
+const parseIndexOptions = require('./utils').parseIndexOptions;
+const debugOptions = require('./utils').debugOptions;
+const CommandCursor = require('./command_cursor');
+const handleCallback = require('./utils').handleCallback;
+const filterOptions = require('./utils').filterOptions;
+const toError = require('./utils').toError;
+const ReadPreference = require('mongodb-core').ReadPreference;
+const f = require('util').format;
+const Admin = require('./admin');
+const Code = require('mongodb-core').BSON.Code;
+const MongoError = require('mongodb-core').MongoError;
+const ObjectID = require('mongodb-core').ObjectID;
+const Logger = require('mongodb-core').Logger;
+const Collection = require('./collection');
+const crypto = require('crypto');
+const mergeOptionsAndWriteConcern = require('./utils').mergeOptionsAndWriteConcern;
+const executeOperation = require('./utils').executeOperation;
+const applyWriteConcern = require('./utils').applyWriteConcern;
 
 var debugFields = [
   'authSource',
@@ -65,15 +65,14 @@ var illegalCommandFields = [
  *
  * @example
  * const MongoClient = require('mongodb').MongoClient;
- * const test = require('assert');
  * // Connection url
  * const url = 'mongodb://localhost:27017';
  * // Database Name
  * const dbName = 'test';
  * // Connect using MongoClient
  * MongoClient.connect(url, function(err, client) {
- *   // Get an additional db
- *   const testDb = client.db('test');
+ *   // Select the database by name
+ *   const testDb = client.db(dbName);
  *   client.close();
  * });
  */
@@ -223,8 +222,6 @@ var Db = function(databaseName, topology, options) {
 
 inherits(Db, EventEmitter);
 
-var define = (Db.define = new Define('Db', Db, false));
-
 // Topology
 Object.defineProperty(Db.prototype, 'topology', {
   enumerable: true,
@@ -360,8 +357,6 @@ Db.prototype.command = function(command, options, callback) {
   return executeOperation(this.s.topology, executeCommand, [this, command, options, callback]);
 };
 
-define.classMethod('command', { callback: true, promise: true });
-
 /**
  * Return the Admin db instance
  * @method
@@ -371,8 +366,6 @@ Db.prototype.admin = function() {
   return new Admin(this, this.s.topology, this.s.promiseLibrary);
 };
 
-define.classMethod('admin', { callback: false, promise: false, returns: [Admin] });
-
 /**
  * The callback format for the collection method, must be used if strict is specified
  * @callback Db~collectionResultCallback
@@ -482,23 +475,10 @@ Db.prototype.collection = function(name, options, callback) {
   });
 };
 
-define.classMethod('collection', { callback: true, promise: false, returns: [Collection] });
-
-function decorateWithWriteConcern(command, self, options) {
-  // Do we support write concerns 3.4 and higher
-  if (self.s.topology.capabilities().commandsTakeWriteConcern) {
-    // Get the write concern settings
-    var finalOptions = writeConcern(shallowClone(options), self, options);
-    // Add the write concern to the command
-    if (finalOptions.writeConcern) {
-      command.writeConcern = finalOptions.writeConcern;
-    }
-  }
-}
-
 var createCollection = function(self, name, options, callback) {
   // Get the write concern options
-  var finalOptions = writeConcern(shallowClone(options), self, options);
+  const finalOptions = applyWriteConcern(shallowClone(options), { db: self }, options);
+
   // Did the user destroy the topology
   if (self.serverConfig && self.serverConfig.isDestroyed()) {
     return callback(new MongoError('topology was destroyed'));
@@ -542,7 +522,8 @@ var createCollection = function(self, name, options, callback) {
       var cmd = { create: name };
 
       // Decorate command with writeConcern if supported
-      decorateWithWriteConcern(cmd, self, options);
+      applyWriteConcern(cmd, { db: self }, options);
+
       // Add all optional parameters
       for (var n in options) {
         if (
@@ -616,8 +597,6 @@ Db.prototype.createCollection = function(name, options, callback) {
   return executeOperation(this.s.topology, createCollection, [this, name, options, callback]);
 };
 
-define.classMethod('createCollection', { callback: true, promise: true });
-
 /**
  * Get all the db statistics.
  *
@@ -645,8 +624,6 @@ Db.prototype.stats = function(options, callback) {
   return this.command(commandObject, options, callback);
 };
 
-define.classMethod('stats', { callback: true, promise: true });
-
 // Transformation methods for cursor results
 var listCollectionsTranforms = function(databaseName) {
   var matching = f('%s.', databaseName);
@@ -745,12 +722,6 @@ Db.prototype.listCollections = function(filter, options) {
   return cursor;
 };
 
-define.classMethod('listCollections', {
-  callback: false,
-  promise: false,
-  returns: [CommandCursor]
-});
-
 var evaluate = function(self, code, parameters, options, callback) {
   var finalCode = code;
   var finalParameters = [];
@@ -814,8 +785,6 @@ Db.prototype.eval = function(code, parameters, options, callback) {
   return executeOperation(this.s.topology, evaluate, [this, code, parameters, options, callback]);
 };
 
-define.classMethod('eval', { callback: true, promise: true });
-
 /**
  * Rename a collection.
  *
@@ -842,8 +811,6 @@ Db.prototype.renameCollection = function(fromCollection, toCollection, options,
   ]);
 };
 
-define.classMethod('renameCollection', { callback: true, promise: true });
-
 /**
  * Drop a collection from the database, removing it permanently. New accesses will create a new collection.
  *
@@ -862,7 +829,7 @@ Db.prototype.dropCollection = function(name, options, callback) {
   var cmd = { drop: name };
 
   // Decorate with write concern
-  decorateWithWriteConcern(cmd, this, options);
+  applyWriteConcern(cmd, { db: this }, options);
 
   // options
   const opts = Object.assign({}, this.s.options, { readPreference: ReadPreference.PRIMARY });
@@ -884,8 +851,6 @@ const dropCollection = (self, cmd, options, callback) => {
   });
 };
 
-define.classMethod('dropCollection', { callback: true, promise: true });
-
 /**
  * Drop a database, removing it permanently from the server.
  *
@@ -902,7 +867,7 @@ Db.prototype.dropDatabase = function(options, callback) {
   var cmd = { dropDatabase: 1 };
 
   // Decorate with write concern
-  decorateWithWriteConcern(cmd, this, options);
+  applyWriteConcern(cmd, { db: this }, options);
 
   // Ensure primary only
   const finalOptions = Object.assign({}, this.s.options, {
@@ -929,8 +894,6 @@ const dropDatabase = (self, cmd, options, callback) => {
   });
 };
 
-define.classMethod('dropDatabase', { callback: true, promise: true });
-
 /**
  * Fetch all collections for the current db.
  *
@@ -974,8 +937,6 @@ var collections = function(self, options, callback) {
   });
 };
 
-define.classMethod('collections', { callback: true, promise: true });
-
 /**
  * Runs a command on the database as admin.
  * @method
@@ -1015,8 +976,6 @@ const executeDbAdminCommand = (self, selector, options, callback) => {
   });
 };
 
-define.classMethod('executeDbAdminCommand', { callback: true, promise: true });
-
 /**
  * Creates an index on the db and collection collection.
  * @method
@@ -1056,7 +1015,7 @@ Db.prototype.createIndex = function(name, fieldOrSpec, options, callback) {
 var createIndex = function(self, name, fieldOrSpec, options, callback) {
   // Get the write concern options
   var finalOptions = Object.assign({}, { readPreference: ReadPreference.PRIMARY }, options);
-  finalOptions = writeConcern(finalOptions, self, options);
+  finalOptions = applyWriteConcern(finalOptions, { db: self }, options);
 
   // Ensure we have a callback
   if (finalOptions.writeConcern && typeof callback !== 'function') {
@@ -1105,8 +1064,6 @@ var createIndex = function(self, name, fieldOrSpec, options, callback) {
   });
 };
 
-define.classMethod('createIndex', { callback: true, promise: true });
-
 /**
  * Ensures that an index exists, if it does not it creates it
  * @method
@@ -1145,7 +1102,7 @@ Db.prototype.ensureIndex = function(name, fieldOrSpec, options, callback) {
 
 var ensureIndex = function(self, name, fieldOrSpec, options, callback) {
   // Get the write concern options
-  var finalOptions = writeConcern({}, self, options);
+  var finalOptions = applyWriteConcern({}, { db: self }, options);
   // Create command
   var selector = createCreateIndexCommand(self, name, fieldOrSpec, options);
   var index_name = selector.name;
@@ -1169,8 +1126,6 @@ var ensureIndex = function(self, name, fieldOrSpec, options, callback) {
   });
 };
 
-define.classMethod('ensureIndex', { callback: true, promise: true });
-
 Db.prototype.addChild = function(db) {
   if (this.s.parentDb) return this.s.parentDb.addChild(db);
   this.s.children.push(db);
@@ -1232,7 +1187,7 @@ var _executeAuthCreateUserCommand = function(self, username, password, options,
   };
 
   // Apply write concern to command
-  command = writeConcern(command, self, options);
+  command = applyWriteConcern(command, { db: self }, options);
 
   // Use node md5 generator
   var md5 = crypto.createHash('md5');
@@ -1269,7 +1224,8 @@ var addUser = function(self, username, password, options, callback) {
   _executeAuthCreateUserCommand(self, username, password, options, function(err, r) {
     // We need to perform the backward compatible insert operation
     if (err && err.code === -5000) {
-      var finalOptions = writeConcern(shallowClone(options), self, options);
+      var finalOptions = applyWriteConcern(shallowClone(options), { db: self }, options);
+
       // Use node md5 generator
       var md5 = crypto.createHash('md5');
       // Generate keys used for authentication
@@ -1342,8 +1298,6 @@ Db.prototype.addUser = function(username, password, options, callback) {
   return executeOperation(this.s.topology, addUser, [this, username, password, options, callback]);
 };
 
-define.classMethod('addUser', { callback: true, promise: true });
-
 var _executeAuthRemoveUserCommand = function(self, username, options, callback) {
   if (typeof options === 'function') (callback = options), (options = {});
   options = options || {};
@@ -1367,7 +1321,7 @@ var _executeAuthRemoveUserCommand = function(self, username, options, callback)
   };
 
   // Apply write concern to command
-  command = writeConcern(command, self, options);
+  command = applyWriteConcern(command, { db: self }, options);
 
   // Force write using primary
   commandOptions.readPreference = ReadPreference.primary;
@@ -1384,7 +1338,7 @@ var removeUser = function(self, username, options, callback) {
   // Attempt to execute command
   _executeAuthRemoveUserCommand(self, username, options, function(err, result) {
     if (err && err.code === -5000) {
-      var finalOptions = writeConcern(shallowClone(options), self, options);
+      var finalOptions = applyWriteConcern(shallowClone(options), { db: self }, options);
       // If we have another db set
       var db = options.dbName ? new Db(options.dbName, self.s.topology, self.s.options) : self;
 
@@ -1407,8 +1361,6 @@ var removeUser = function(self, username, options, callback) {
   });
 };
 
-define.classMethod('removeUser', { callback: true, promise: true });
-
 /**
  * Remove a user from a database
  * @method
@@ -1470,8 +1422,6 @@ var setProfilingLevel = function(self, level, options, callback) {
   });
 };
 
-define.classMethod('setProfilingLevel', { callback: true, promise: true });
-
 /**
  * Retrive the current profiling information for MongoDB
  *
@@ -1499,8 +1449,6 @@ var profilingInfo = function(self, options, callback) {
   }
 };
 
-define.classMethod('profilingInfo', { callback: true, promise: true });
-
 /**
  * Retrieve the current profiling Level for MongoDB
  *
@@ -1530,8 +1478,6 @@ var profilingLevel = function(self, options, callback) {
   });
 };
 
-define.classMethod('profilingLevel', { callback: true, promise: true });
-
 /**
  * Retrieves this collections index info.
  * @method
@@ -1586,8 +1532,6 @@ var indexInformation = function(self, name, options, callback) {
     });
 };
 
-define.classMethod('indexInformation', { callback: true, promise: true });
-
 var createCreateIndexCommand = function(db, name, fieldOrSpec, options) {
   var indexParameters = parseIndexOptions(fieldOrSpec);
   var fieldHash = indexParameters.fieldHash;
@@ -1661,10 +1605,7 @@ var createIndexUsingCreateIndexes = function(self, name, fieldOrSpec, options, c
   }
 
   // Create command, apply write concern to command
-  var cmd = writeConcern({ createIndexes: name, indexes: indexes }, self, options);
-
-  // Decorate command with writeConcern if supported
-  decorateWithWriteConcern(cmd, self, options);
+  var cmd = applyWriteConcern({ createIndexes: name, indexes: indexes }, { db: self }, options);
 
   // ReadPreference primary
   options.readPreference = ReadPreference.PRIMARY;
@@ -1696,26 +1637,6 @@ var validateDatabaseName = function(databaseName) {
   }
 };
 
-// Get write concern
-var writeConcern = function(target, db, options) {
-  if (options.w != null || options.j != null || options.fsync != null) {
-    var opts = {};
-    if (options.w) opts.w = options.w;
-    if (options.wtimeout) opts.wtimeout = options.wtimeout;
-    if (options.j) opts.j = options.j;
-    if (options.fsync) opts.fsync = options.fsync;
-    target.writeConcern = opts;
-  } else if (
-    db.writeConcern.w != null ||
-    db.writeConcern.j != null ||
-    db.writeConcern.fsync != null
-  ) {
-    target.writeConcern = db.writeConcern;
-  }
-
-  return target;
-};
-
 // Add listeners to topology
 var createListener = function(self, e, object) {
   var listener = function(err) {

package/lib/gridfs/grid_store.js

@@ -35,20 +35,18 @@
  *   });
  * });
  */
-var Chunk = require('./chunk'),
-  ObjectID = require('mongodb-core').BSON.ObjectID,
-  ReadPreference = require('mongodb-core').ReadPreference,
-  Buffer = require('buffer').Buffer,
-  Collection = require('../collection'),
-  fs = require('fs'),
-  f = require('util').format,
-  util = require('util'),
-  Define = require('../metadata'),
-  MongoError = require('mongodb-core').MongoError,
-  inherits = util.inherits,
-  Duplex = require('stream').Duplex,
-  shallowClone = require('../utils').shallowClone,
-  executeOperation = require('../utils').executeOperation;
+const Chunk = require('./chunk');
+const ObjectID = require('mongodb-core').BSON.ObjectID;
+const ReadPreference = require('mongodb-core').ReadPreference;
+const Buffer = require('buffer').Buffer;
+const fs = require('fs');
+const f = require('util').format;
+const util = require('util');
+const MongoError = require('mongodb-core').MongoError;
+const inherits = util.inherits;
+const Duplex = require('stream').Duplex;
+const shallowClone = require('../utils').shallowClone;
+const executeOperation = require('../utils').executeOperation;
 
 var REFERENCE_BY_FILENAME = 0,
   REFERENCE_BY_ID = 1;
@@ -174,8 +172,6 @@ var GridStore = function GridStore(db, id, filename, mode, options) {
   });
 };
 
-var define = (GridStore.define = new Define('Gridstore', GridStore, true));
-
 /**
  * The callback format for the Gridstore.open method
  * @callback GridStore~openCallback
@@ -242,9 +238,6 @@ var open = function(self, options, callback) {
   }
 };
 
-// Push the definition for open
-define.classMethod('open', { callback: true, promise: true });
-
 /**
  * Verify if the file is at EOF.
  *
@@ -256,8 +249,6 @@ GridStore.prototype.eof = function() {
   return this.position === this.length ? true : false;
 };
 
-define.classMethod('eof', { callback: false, promise: false, returns: [Boolean] });
-
 /**
  * The callback result format.
  * @callback GridStore~resultCallback
@@ -299,8 +290,6 @@ var getc = function(self, options, callback) {
   }
 };
 
-define.classMethod('getc', { callback: true, promise: true });
-
 /**
  * Writes a string to the file with a newline character appended at the end if
  * the given string does not have one.
@@ -326,8 +315,6 @@ GridStore.prototype.puts = function(string, options, callback) {
   );
 };
 
-define.classMethod('puts', { callback: true, promise: true });
-
 /**
  * Return a modified Readable stream including a possible transform method.
  *
@@ -339,8 +326,6 @@ GridStore.prototype.stream = function() {
   return new GridStoreStream(this);
 };
 
-define.classMethod('stream', { callback: false, promise: false, returns: [GridStoreStream] });
-
 /**
  * Writes some data. This method will work properly only if initialized with mode "w" or "w+".
  *
@@ -365,8 +350,6 @@ GridStore.prototype.write = function write(data, close, options, callback) {
   );
 };
 
-define.classMethod('write', { callback: true, promise: true });
-
 /**
  * Handles the destroy part of a stream
  *
@@ -385,8 +368,6 @@ GridStore.prototype.destroy = function destroy() {
   }
 };
 
-define.classMethod('destroy', { callback: false, promise: false });
-
 /**
  * Stores a file from the file system to the GridFS database.
  *
@@ -471,8 +452,6 @@ var writeFile = function(self, file, options, callback) {
   });
 };
 
-define.classMethod('writeFile', { callback: true, promise: true });
-
 /**
  * Saves this file to the database. This will overwrite the old entry if it
  * already exists. This will work properly only if mode was initialized to
@@ -558,8 +537,6 @@ var close = function(self, options, callback) {
   }
 };
 
-define.classMethod('close', { callback: true, promise: true });
-
 /**
  * The collection callback format.
  * @callback GridStore~collectionCallback
@@ -580,8 +557,6 @@ GridStore.prototype.chunkCollection = function(callback) {
   return this.db.collection(this.root + '.chunks');
 };
 
-define.classMethod('chunkCollection', { callback: true, promise: false, returns: [Collection] });
-
 /**
  * Deletes all the chunks of this file in the database.
  *
@@ -621,8 +596,6 @@ var unlink = function(self, options, callback) {
   });
 };
 
-define.classMethod('unlink', { callback: true, promise: true });
-
 /**
  * Retrieves the file collection associated with this object.
  *
@@ -636,8 +609,6 @@ GridStore.prototype.collection = function(callback) {
   return this.db.collection(this.root + '.files');
 };
 
-define.classMethod('collection', { callback: true, promise: false, returns: [Collection] });
-
 /**
  * The readlines callback format.
  * @callback GridStore~readlinesCallback
@@ -682,8 +653,6 @@ var readlines = function(self, separator, options, callback) {
   });
 };
 
-define.classMethod('readlines', { callback: true, promise: true });
-
 /**
  * Deletes all the chunks of this file in the database if mode was set to "w" or
  * "w+" and resets the read/write head to the initial position.
@@ -729,8 +698,6 @@ var rewind = function(self, options, callback) {
   }
 };
 
-define.classMethod('rewind', { callback: true, promise: true });
-
 /**
  * The read callback format.
  * @callback GridStore~readCallback
@@ -818,8 +785,6 @@ var read = function(self, length, buffer, options, callback) {
   });
 };
 
-define.classMethod('read', { callback: true, promise: true });
-
 /**
  * The tell callback format.
  * @callback GridStore~tellCallback
@@ -849,8 +814,6 @@ GridStore.prototype.tell = function(callback) {
   });
 };
 
-define.classMethod('tell', { callback: true, promise: true });
-
 /**
  * The tell callback format.
  * @callback GridStore~gridStoreCallback
@@ -930,8 +893,6 @@ var seek = function(self, position, seekLocation, options, callback) {
   seekChunk();
 };
 
-define.classMethod('seek', { callback: true, promise: true });
-
 /**
  * @ignore
  */
@@ -1360,8 +1321,6 @@ var exists = function(db, fileIdObject, rootCollection, options, callback) {
   });
 };
 
-define.staticMethod('exist', { callback: true, promise: true });
-
 /**
  * Gets the list of files stored in the GridFS.
  *
@@ -1421,8 +1380,6 @@ var list = function(db, rootCollection, options, callback) {
   });
 };
 
-define.staticMethod('list', { callback: true, promise: true });
-
 /**
  * Reads the contents of a file.
  *
@@ -1485,8 +1442,6 @@ var readStatic = function(db, name, length, offset, options, callback) {
   });
 };
 
-define.staticMethod('read', { callback: true, promise: true });
-
 /**
  * Read the entire file as a list of strings splitting by the provided separator.
  *
@@ -1526,8 +1481,6 @@ var readlinesStatic = function(db, name, separator, options, callback) {
   });
 };
 
-define.staticMethod('readlines', { callback: true, promise: true });
-
 /**
  * Deletes the chunks and metadata information of a file from GridFS.
  *
@@ -1584,8 +1537,6 @@ var unlinkStatic = function(self, db, names, options, callback) {
   }
 };
 
-define.staticMethod('unlink', { callback: true, promise: true });
-
 /**
  *  @ignore
  */