Fix iterview for views with null keys.

atomatt · atomatt · commit 05363169731e · 2013-04-25T12:02:24.000+02:00
diff --git a/couchdb/client.py b/couchdb/client.py
@@ -852,17 +852,10 @@ def iterview(self, name, batch, wrapper=None, **options):
         limit = options.get('limit')
         if limit is not None and limit <= 0:
             raise ValueError('limit must be 1 or more')
-        startkey, startkey_docid = (options.get('startkey'),
-                                    options.get('startkey_docid'))
         while True:
             loop_limit = min(limit or batch, batch)
             # Get rows in batches, with one extra for start of next batch.
             options['limit'] = loop_limit + 1
-            # Add start keys, if any.
-            if startkey is not None: # XXX todo: None is a valid key value
-                options['startkey'] = startkey
-            if startkey_docid is not None:
-                options['startkey_docid'] = startkey_docid
             rows = list(self.view(name, wrapper, **options))
             # Yield rows from this batch.
             for row in itertools.islice(rows, loop_limit):
@@ -873,8 +866,8 @@ def iterview(self, name, batch, wrapper=None, **options):
             # Check if there is nothing else to yield.
             if len(rows) <= batch or (limit is not None and limit == 0):
                 break
-            # Save start keys for next loop.
-            startkey, startkey_docid = rows[-1]['key'], rows[-1]['id']
+            # Update options with start keys for next loop.
+            options.update(startkey=rows[-1]['key'], startkey_docid=rows[-1]['id'])
 
     def show(self, name, docid=None, **options):
         """Call a 'show' function.
diff --git a/couchdb/tests/client.py b/couchdb/tests/client.py
@@ -741,7 +741,8 @@ def docfromrow(self, row):
     def setUp(self):
         super(ViewIterationTestCase, self).setUp()
         design_doc = {'_id': '_design/test',
-                      'views': {'nums': {'map': 'function(doc) {emit(doc.num, null);}'}}}
+                      'views': {'nums': {'map': 'function(doc) {emit(doc.num, null);}'},
+                                'nulls': {'map': 'function(doc) {emit(null, null);}'}}}
         self.db.save(design_doc)
         self.db.update([self.docfromnum(num) for num in xrange(self.num_docs)])
 
@@ -788,6 +789,9 @@ def test_startkey(self):
         self.assertEqual([self.docfromrow(doc) for doc in self.db.iterview('test/nums', 10, startkey=1, descending=True)],
                          [self.docfromnum(x) for x in xrange(3, -1, -1)])
 
+    def test_nullkeys(self):
+        self.assertEqual(len(list(self.db.iterview('test/nulls', 10))), self.num_docs)
+
 
 def suite():
     suite = unittest.TestSuite()
