NODE-808 merged PR from valeri and added testcase to index_tests.js

Author: christkv

lib/db.js

@@ -1046,10 +1046,12 @@ var createIndex = function(self, name, fieldOrSpec, options, callback) {
   createIndexUsingCreateIndexes(self, name, fieldOrSpec, options, function(err, result) {
     if(err == null) return handleCallback(callback, err, result);
 
-    // 67 = 'CannotCreateIndex', means that the server recognized
-    // `createIndex` as a command and so we don't need to fallback to
-    // an insert.
-    if(err.code === 67 || err.code == 11000) {
+    // 67 = 'CannotCreateIndex' (malformed index options)
+    // 85 = 'IndexOptionsConflict' (index already exists with different options)
+    // 11000 = 'DuplicateKey' (couldn't build unique index because of dupes)
+    // These errors mean that the server recognized `createIndex` as a command
+    // and so we don't need to fallback to an insert.
+    if(err.code === 67 || err.code == 11000 || err.code === 85) {
       return handleCallback(callback, err, result);
     }
 

package.json

@@ -15,12 +15,13 @@
   "dependencies": {
     "es6-promise": "3.2.1",
     "mongodb-core": "2.0.11",
+    "mongodb-core": "christkv/mongodb-core#2.0",
     "readable-stream": "2.1.5"
   },
   "devDependencies": {
     "JSONStream": "^1.0.7",
     "betterbenchmarks": "^0.1.0",
-    "bluebird": "3.4.1",
+    "bluebird": "3.4.3",
     "bson": "^0.5.1",
     "cli-table": "^0.3.1",
     "co": "4.6.0",
@@ -31,7 +32,7 @@
     "integra": "0.1.8",
     "jsdoc": "3.4.0",
     "ldjson-stream": "^1.2.1",
-    "mongodb-extended-json": "1.7.0",
+    "mongodb-extended-json": "1.7.1",
     "mongodb-topology-manager": "1.0.x",
     "mongodb-version-manager": "^1.0.6",
     "nyc": "^8.1.0",

test/functional/index_tests.js

@@ -1023,3 +1023,30 @@ exports['should correctly create Index with sub element'] = {
     });
   }
 }
+
+/**
+ * @ignore
+ */
+exports['should correctly fail detect error code 85 when peforming createIndex'] = {
+  metadata: { requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'], mongodb: ">=3.0.0" } },
+
+  // The actual test we wish to run
+  test: function(configuration, test) {
+    var db = configuration.newDbInstance(configuration.writeConcernMax(), {poolSize:1});
+    db.open(function(err, db) {
+      var collection = db.collection('messed_up_options');
+
+      collection.ensureIndex({ 'a.one': 1, 'a.two': 1 }, { name: 'n1', partialFilterExpression: { 'a.two': { $exists: true } } }, function(err, r) {
+        test.equal(null, err);
+
+        collection.ensureIndex({ 'a.one': 1, 'a.two': 1 }, { name: 'n2', partialFilterExpression: { 'a.too': { $exists: true } } }, function(err, r) {
+          test.ok(err);
+          test.equal(85, err.code);
+
+          db.close();
+          test.done();
+        });
+      });
+    });
+  }
+}