summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2022-06-07 17:02:20 +0000
committerGerrit Code Review <gerrit@ci3.zzzcomputing.com>2022-06-07 17:02:20 +0000
commitc0736e0b2a3bf8c0952db84f5b9943df9ebf18f7 (patch)
tree9745c189c2d954759dfc88610f1d1de62efe7247 /lib/sqlalchemy/orm
parent938c5d1033085289b4cbbd4b9229eaa3ad90b66d (diff)
parent1c99edf1b988f55411bd8bef917b9664a39d218b (diff)
downloadsqlalchemy-c0736e0b2a3bf8c0952db84f5b9943df9ebf18f7.tar.gz
Merge "migrate labels to new tutorial" into main
Diffstat (limited to 'lib/sqlalchemy/orm')
-rw-r--r--lib/sqlalchemy/orm/_orm_constructors.py10
-rw-r--r--lib/sqlalchemy/orm/query.py5
-rw-r--r--lib/sqlalchemy/orm/relationships.py2
3 files changed, 4 insertions, 13 deletions
diff --git a/lib/sqlalchemy/orm/_orm_constructors.py b/lib/sqlalchemy/orm/_orm_constructors.py
index ece6a52be..e68282865 100644
--- a/lib/sqlalchemy/orm/_orm_constructors.py
+++ b/lib/sqlalchemy/orm/_orm_constructors.py
@@ -856,7 +856,7 @@ def relationship(
:ref:`relationship_config_toplevel` - Full introductory and
reference documentation for :func:`_orm.relationship`.
- :ref:`orm_tutorial_relationship` - ORM tutorial introduction.
+ :ref:`tutorial_orm_related_objects` - ORM tutorial introduction.
:param argument:
A mapped class, or actual :class:`_orm.Mapper` instance,
@@ -923,9 +923,6 @@ def relationship(
:ref:`relationships_many_to_many` - Reference example of "many
to many".
- :ref:`orm_tutorial_many_to_many` - ORM tutorial introduction to
- many-to-many relationships.
-
:ref:`self_referential_many_to_many` - Specifics on using
many-to-many in a self-referential case.
@@ -1029,9 +1026,6 @@ def relationship(
:ref:`unitofwork_cascades` - Full detail on each of the available
cascade options.
- :ref:`tutorial_delete_cascade` - Tutorial example describing
- a delete cascade.
-
:param cascade_backrefs=False:
Legacy; this flag is always False.
@@ -2095,8 +2089,6 @@ def aliased(
:ref:`orm_queryguide_orm_aliases` - in the :ref:`queryguide_toplevel`
- :ref:`ormtutorial_aliases` - in the legacy :ref:`ormtutorial_toplevel`
-
:param element: element to be aliased. Is normally a mapped class,
but for convenience can also be a :class:`_expression.FromClause`
element.
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 419891708..596e91099 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -3050,9 +3050,8 @@ class Query(
:param values: a dictionary with attributes names, or alternatively
mapped attributes or SQL expressions, as keys, and literal
values or sql expressions as values. If :ref:`parameter-ordered
- mode <updates_order_parameters>` is desired, the values can be
- passed as a list of 2-tuples;
- this requires that the
+ mode <tutorial_parameter_ordered_updates>` is desired, the values can
+ be passed as a list of 2-tuples; this requires that the
:paramref:`~sqlalchemy.sql.expression.update.preserve_parameter_order`
flag is passed to the :paramref:`.Query.update.update_args` dictionary
as well.
diff --git a/lib/sqlalchemy/orm/relationships.py b/lib/sqlalchemy/orm/relationships.py
index deaf52147..630f6898f 100644
--- a/lib/sqlalchemy/orm/relationships.py
+++ b/lib/sqlalchemy/orm/relationships.py
@@ -985,7 +985,7 @@ class Relationship(
See :meth:`~.Relationship.Comparator.any` for
a less-performant alternative using EXISTS, or refer
to :meth:`_query.Query.outerjoin`
- as well as :ref:`ormtutorial_joins`
+ as well as :ref:`orm_queryguide_joins`
for more details on constructing outer joins.
kwargs may be ignored by this operator but are required for API