summaryrefslogtreecommitdiff
path: root/doc/build
diff options
context:
space:
mode:
Diffstat (limited to 'doc/build')
-rw-r--r--doc/build/conf.py2
-rw-r--r--doc/build/orm/loading_relationships.rst2
-rw-r--r--doc/build/orm/query.rst10
3 files changed, 11 insertions, 3 deletions
diff --git a/doc/build/conf.py b/doc/build/conf.py
index 95c690fae..713de1fc7 100644
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -109,6 +109,8 @@ autodocmods_convert_modname = {
"sqlalchemy.util._collections": "sqlalchemy.util",
"sqlalchemy.orm.relationships": "sqlalchemy.orm",
"sqlalchemy.orm.interfaces": "sqlalchemy.orm",
+ "sqlalchemy.orm.query": "sqlalchemy.orm",
+ "sqlalchemy.orm.util": "sqlalchemy.orm",
}
autodocmods_convert_modname_w_class = {
diff --git a/doc/build/orm/loading_relationships.rst b/doc/build/orm/loading_relationships.rst
index a53ad1d3d..50d3cc51a 100644
--- a/doc/build/orm/loading_relationships.rst
+++ b/doc/build/orm/loading_relationships.rst
@@ -1250,8 +1250,6 @@ and ``A.b.a`` from our event:
Relationship Loader API
-----------------------
-.. autofunction:: contains_alias
-
.. autofunction:: contains_eager
.. autofunction:: defaultload
diff --git a/doc/build/orm/query.rst b/doc/build/orm/query.rst
index 694405d63..3fddd6c34 100644
--- a/doc/build/orm/query.rst
+++ b/doc/build/orm/query.rst
@@ -21,6 +21,14 @@ Following is the full interface for the :class:`_query.Query` object.
.. autoclass:: sqlalchemy.orm.query.Query
:members:
+ .. automethod:: sqlalchemy.orm.query.Query.prefix_with
+
+ .. automethod:: sqlalchemy.orm.query.Query.suffix_with
+
+ .. automethod:: sqlalchemy.orm.query.Query.with_hint
+
+ .. automethod:: sqlalchemy.orm.query.Query.with_statement_hint
+
ORM-Specific Query Constructs
=============================
@@ -30,7 +38,7 @@ ORM-Specific Query Constructs
.. autoclass:: sqlalchemy.orm.util.AliasedInsp
-.. autoclass:: sqlalchemy.orm.query.Bundle
+.. autoclass:: sqlalchemy.orm.util.Bundle
:members:
.. autoclass:: sqlalchemy.orm.strategy_options.Load