summaryrefslogtreecommitdiff
path: root/doc/build
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2019-12-01 17:24:27 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2020-05-24 11:54:08 -0400
commitdce8c7a125cb99fad62c76cd145752d5afefae36 (patch)
tree352dfa2c38005207ca64f45170bbba2c0f8c927e /doc/build
parent1502b5b3e4e4b93021eb927a6623f288ef006ba6 (diff)
downloadsqlalchemy-dce8c7a125cb99fad62c76cd145752d5afefae36.tar.gz
Unify Query and select() , move all processing to compile phase
Convert Query to do virtually all compile state computation in the _compile_context() phase, and organize it all such that a plain select() construct may also be used as the source of information in order to generate ORM query state. This makes it such that Query is not needed except for its additional methods like from_self() which are all to be deprecated. The construction of ORM state will occur beyond the caching boundary when the new execution model is integrated. future select() gains a working join() and filter_by() method. as we continue to rebase and merge each commit in the steps, callcounts continue to bump around. will have to look at the final result when it's all in. References: #5159 References: #4705 References: #4639 References: #4871 References: #5010 Change-Id: I19e05b3424b07114cce6c439b05198ac47f7ac10
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