Improve support for the include_docs option in the schema module.

cmlenz · cmlenz · commit adaaaa18d698 · 2008-11-14T19:51:57.000Z
--HG--
extra : convert_revision : svn%3A7a298fb0-333a-0410-83e7-658617cd9cf3/trunk%40123
diff --git a/couchdb/schema.py b/couchdb/schema.py
@@ -233,6 +233,8 @@ def __init__(self, design, map_fun, reduce_fun=None,
     def __get__(self, instance, cls=None):
         if self.wrapper is DEFAULT:
             def wrapper(row):
+                if row.doc is not None:
+                    return cls.wrap(row.doc)
                 data = row.value
                 data['_id'] = row.id
                 return cls.wrap(data)
@@ -340,10 +342,13 @@ def query(cls, db, map_fun, reduce_fun, language='javascript',
         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.
+        this will initiate a new HTTP request for every document, unless the
+        `include_docs` option is explitly specified.
         """
         def _wrapper(row):
             if eager:
+                if row.doc is not None:
+                    return row.doc
                 return cls.load(db, row.id)
             data = row.value
             data['_id'] = row.id
@@ -360,10 +365,13 @@ def view(cls, db, viewname, eager=False, **options):
         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.
+        this will initiate a new HTTP request for every document, unless the
+        `include_docs` option is explitly specified.
         """
         def _wrapper(row):
             if eager:
+                if row.doc is not None:
+                    return row.doc
                 return cls.load(db, row.id)
             data = row.value
             data['_id'] = row.id
