NODE-385 GridStore.exist does not take ObjectId for filename

FredLackeyOfficial · Mar 16, 2015 · 9b36656 · 9b36656
1 parent 9782b12
commit 9b36656
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 0 deletions.
diff --git a/lib/gridfs/grid_store.js b/lib/gridfs/grid_store.js
@@ -1082,6 +1082,12 @@ GridStore.exist = function(db, fileIdObject, rootCollection, options, callback)
       ? {'filename':fileIdObject}
       : {'_id':fileIdObject};    // Attempt to locate file
 
+    // We have a specific query
+    if(fileIdObject != null && typeof fileIdObject == 'object') {
+      query = fileIdObject;
+    }
+
+    // Check if the entry exists
     collection.findOne(query, {readPreference:readPreference}, function(err, item) {
       if(err) return callback(err);
       callback(null, item == null ? false : true);

diff --git a/test/functional/gridfs_tests.js b/test/functional/gridfs_tests.js
@@ -2737,3 +2737,37 @@ exports['should fail when seeking on a write enabled gridstore object'] = {
     });
   }
 }
+
+/**
+ * @ignore
+ */
+exports['should correctly handle filename as ObjectId'] = {
+  metadata: { requires: { topology: ['single', 'replicaset', 'sharded', 'ssl', 'heap', 'wiredtiger'] } },
+
+  // The actual test we wish to run
+  test: function(configuration, test) {
+    var GridStore = configuration.require.GridStore
+      , ObjectID = configuration.require.ObjectID;
+
+    var db = configuration.newDbInstance(configuration.writeConcernMax(), {poolSize:1});
+    db.open(function(err, db) {
+      var id = new ObjectID();
+      var gridStore = new GridStore(db, id, id, "w");
+      gridStore.open(function(err, gridStore) {
+        gridStore.write("hello world!", function(err, gridStore) {
+          gridStore.close(function(err, result) {
+
+            // Check if file exists
+            GridStore.exist(db, {filename: id}, function(err, r) {
+              test.equal(true, r);
+
+              db.close();
+              test.done();
+            });
+          });
+        });
+      });
+    });
+  }
+}
+