Merge pull request mongodb#320 from year2013/master

Timeout option in collection.find() not passed correctly to Cursor if false
christkv · Aug 19, 2011 · cffa65e · cffa65e
2 parents af5fdf8 + b74743b
commit cffa65e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/lib/mongodb/collection.js b/lib/mongodb/collection.js
@@ -637,7 +637,7 @@ Collection.prototype.find = function find () {
   options.skip = len > 3 ? args[2] : options.skip ? options.skip : 0;
   options.limit = len > 3 ? args[3] : options.limit ? options.limit : 0;
   options.hint = options.hint != null ? this.normalizeHintField(options.hint) : this.internalHint;
-  options.timeout = len == 5 ? args[4] : options.timeout ? options.timeout : undefined;
+  options.timeout = len == 5 ? args[4] : typeof options.timeout === 'undefined' ? undefined : options.timeout;
   // If we have overridden slaveOk otherwise use the default db setting
   options.slaveOk = options.slaveOk != null ? options.slaveOk : this.db.slaveOk;
 

diff --git a/test/find_test.js b/test/find_test.js
@@ -770,10 +770,26 @@ var tests = testCase({
         })        
       });      
     });      
-  }  
+  },
+
+  'Should correctly pass timeout options to cursor' : function(test) {
+    client.createCollection('timeoutFalse', function(err, collection) {
+      collection.find({},{timeout:false},function(err, cursor) {
+        test.equal(false, cursor.timeout);
+      });
+      collection.find({},{timeout:true},function(err, cursor) {
+        test.equal(true, cursor.timeout);
+      });
+      collection.find({},{},function(err, cursor) {
+        test.equal(true, cursor.timeout);
+      });
+
+      test.done();
+    });
+  }
 })
 
 // Stupid freaking workaround due to there being no way to run setup once for each suite
 var numberOfTestsRun = Object.keys(tests).length;
 // Assign out tests
-module.exports = tests;
+module.exports = tests;