summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/query.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-08-31 18:05:17 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2014-08-31 18:05:31 -0400
commitbdfe680708d869d37dd5c1bc2d2b045639caba9d (patch)
tree0ca63b1c95c5b13f36b8fde7a0a76468c941b995 /lib/sqlalchemy/orm/query.py
parentd7131ffad378453b732a6438e2228e323ab6c537 (diff)
downloadsqlalchemy-bdfe680708d869d37dd5c1bc2d2b045639caba9d.tar.gz
- improve from_statement() doc
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
-rw-r--r--lib/sqlalchemy/orm/query.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 72989f34b..090284d9f 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -2348,9 +2348,15 @@ class Query(object):
This method bypasses all internal statement compilation, and the
statement is executed without modification.
- The statement argument is either a string, a ``select()`` construct,
- or a ``text()`` construct, and should return the set of columns
- appropriate to the entity class represented by this ``Query``.
+ The statement is typically either a :func:`~.expression.text`
+ or :func:`~.expression.select` construct, and should return the set
+ of columns
+ appropriate to the entity class represented by this :class:`.Query`.
+
+ .. seealso::
+
+ :ref:`orm_tutorial_literal_sql` - usage examples in the
+ ORM tutorial
"""
if isinstance(statement, util.string_types):