From: Studnikov Dmitry Date: Fri, 13 Sep 2024 20:01:26 +0000 (+0300) Subject: Fix subquery typos in documentation and changelog (#11807) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08c916df4ec21b6929d90b90eb3cfe50343f2260;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Fix subquery typos in documentation and changelog (#11807) * fix: subquery typo * fix: subquery typo in changelog --------- Co-authored-by: Dmitry Studnikov --- diff --git a/doc/build/changelog/changelog_14.rst b/doc/build/changelog/changelog_14.rst index f5a69b2fb6..1c41c586c4 100644 --- a/doc/build/changelog/changelog_14.rst +++ b/doc/build/changelog/changelog_14.rst @@ -2473,7 +2473,7 @@ This document details individual issue-level changes made throughout it were only against a table that's now being replaced. It also allows for correct behavior when constructing a :func:`_orm.aliased` without a selectable argument against a :func:`_orm.aliased` that's against a - subuquery, to create an alias of that subquery (i.e. to change its name). + subquery, to create an alias of that subquery (i.e. to change its name). The nesting behavior of :func:`_orm.aliased` remains in place for the case where the outer :func:`_orm.aliased` object is against a subquery which in @@ -5057,7 +5057,7 @@ This document details individual issue-level changes made throughout columns clause of a :class:`_sql.Select` construct, which is better handled by using a :func:`_sql.literal_column` construct, would nonetheless prevent constructs like :func:`_sql.union` from working correctly. Other use cases, - such as constructing subuqeries, continue to work the same as in prior + such as constructing subqueries, continue to work the same as in prior versions where the :func:`_sql.text` construct is silently omitted from the collection of exported columns. Also repairs similar use within the ORM. diff --git a/doc/build/orm/queryguide/select.rst b/doc/build/orm/queryguide/select.rst index 678565932d..a8b273a62d 100644 --- a/doc/build/orm/queryguide/select.rst +++ b/doc/build/orm/queryguide/select.rst @@ -360,7 +360,7 @@ Selecting Entities from Subqueries ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The :func:`_orm.aliased` construct discussed in the previous section -can be used with any :class:`_sql.Subuqery` construct that comes from a +can be used with any :class:`_sql.Subquery` construct that comes from a method such as :meth:`_sql.Select.subquery` to link ORM entities to the columns returned by that subquery; there must be a **column correspondence** relationship between the columns delivered by the subquery and the columns @@ -721,7 +721,7 @@ Joining to Subqueries ^^^^^^^^^^^^^^^^^^^^^ The target of a join may be any "selectable" entity which includes -subuqeries. When using the ORM, it is typical +subqueries. When using the ORM, it is typical that these targets are stated in terms of an :func:`_orm.aliased` construct, but this is not strictly required, particularly if the joined entity is not being returned in the results. For example, to join from the