Fix for issue 76 (wrapping of view results in schema with include_docs=true). Also, removed the eager option, which has been obsoleted by include_docs.

cmlenz · cmlenz · commit 12b329ced016 · 2009-06-29T12:43:28.000Z
--HG--
extra : convert_revision : svn%3A7a298fb0-333a-0410-83e7-658617cd9cf3/trunk%40154
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -12,6 +12,12 @@ http://couchdb-python.googlecode.com/svn/tags/0.6.0
    rev_or_exc)` tuples. See the docstring of that method for the details.
  * `schema.ListField` proxy objects now support the `__contains__()` and
    `index()` methods (issue 77).
+ * The results of the `query()` and `view()` methods in the `schema.Document`
+   class are now properly wrapped in objects of the class if the `include_docs`
+   option is set (issue 76).
+ * Removed the `eager` option on the `query()` and `view()` methods of
+   `schema.Document`. Use the `include_docs` option instead, which doesn't
+   require an additional request per document.
 
 
 Version 0.5
diff --git a/couchdb/schema.py b/couchdb/schema.py
@@ -371,46 +371,37 @@ def store(self, db):
             db[self.id] = self._data
         return self
 
-    def query(cls, db, map_fun, reduce_fun, language='javascript',
-              eager=False, **options):
+    def query(cls, db, map_fun, reduce_fun, language='javascript', **options):
         """Execute a CouchDB temporary view and map the result values back to
         objects of this schema.
         
         Note that by default, any properties of the document that are not
         included in the values of the view will be treated as if they were
-        missing from the document. If you'd rather want to load the full
-        document for every row, set the `eager` option to `True`, but note that
-        this will initiate a new HTTP request for every document, unless the
-        ``include_docs`` option is explitly specified.
+        missing from the document. If you want to load the full document for
+        every row, set the ``include_docs`` option to ``True``.
         """
         def _wrapper(row):
-            if eager:
-                if row.doc is not None:
-                    return row.doc
-                return cls.load(db, row.id)
+            if row.doc is not None:
+                return cls.wrap(row.doc)
             data = row.value
             data['_id'] = row.id
             return cls.wrap(data)
         return db.query(map_fun, reduce_fun=reduce_fun, language=language,
                         wrapper=_wrapper, **options)
     query = classmethod(query)
 
-    def view(cls, db, viewname, eager=False, **options):
+    def view(cls, db, viewname, **options):
         """Execute a CouchDB named view and map the result values back to
         objects of this schema.
         
         Note that by default, any properties of the document that are not
         included in the values of the view will be treated as if they were
-        missing from the document. If you'd rather want to load the full
-        document for every row, set the `eager` option to `True`, but note that
-        this will initiate a new HTTP request for every document, unless the
-        ``include_docs`` option is explitly specified.
+        missing from the document. If you want to load the full document for
+        every row, set the ``include_docs`` option to ``True``.
         """
         def _wrapper(row):
-            if eager:
-                if row.doc is not None:
-                    return row.doc
-                return cls.load(db, row.id)
+            if row.doc is not None: # include_docs=True
+                return cls.wrap(row.doc)
             data = row.value
             data['_id'] = row.id
             return cls.wrap(data)
