summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/query.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2010-09-04 19:59:21 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2010-09-04 19:59:21 -0400
commitb42cbed42765cd00962868c248cee4b1b448c948 (patch)
tree755f90b6aa04f8d7bb8c45f0b293272eec4bab7b /lib/sqlalchemy/orm/query.py
parenta315c5d431cf0598448a789d71aae7e2903dab32 (diff)
downloadsqlalchemy-b42cbed42765cd00962868c248cee4b1b448c948.tar.gz
almost through.
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
-rw-r--r--lib/sqlalchemy/orm/query.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index fdc426a07..41e9a4890 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -779,8 +779,13 @@ class Query(object):
def options(self, *args):
"""Return a new Query object, applying the given list of
- MapperOptions.
-
+ mapper options.
+
+ Most supplied options regard changing how column- and
+ relationship-mapped attributes are loaded. See the sections
+ :ref:`deferred` and :ref:`loading_toplevel` for reference
+ documentation.
+
"""
return self._options(False, *args)