summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2022-10-06 11:57:06 -0400
committerFederico Caselli <cfederico87@gmail.com>2022-10-10 21:27:50 +0200
commitb580b425c37da7d0d4027e588bffcb876d979eb2 (patch)
treeda9d17d98fdf6768794ef71fc754195b765037ba /lib
parent276349200c486eee108471b888acfc47ea19201b (diff)
downloadsqlalchemy-b580b425c37da7d0d4027e588bffcb876d979eb2.tar.gz
doc edits
this is addressing comments still remaining on I9929daab7797be9515f71c888b28af1209e789ff removes "asyncio" wording discussed in #7659 Change-Id: I1bab2a6fde330b83ef34602956c2988ee6331b21
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/orm/session.py5
-rw-r--r--lib/sqlalchemy/sql/selectable.py2
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 9577b4d26..9a9d79113 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -2107,6 +2107,11 @@ class Session(_SessionClassMethods, EventTarget):
.. versionadded:: 1.4.24
+ .. seealso::
+
+ :ref:`orm_queryguide_select_orm_entities` - contrasts the behavior
+ of :meth:`_orm.Session.execute` to :meth:`_orm.Session.scalars`
+
"""
return self._execute_internal(
diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py
index bdc884d7b..7c73255d7 100644
--- a/lib/sqlalchemy/sql/selectable.py
+++ b/lib/sqlalchemy/sql/selectable.py
@@ -5842,7 +5842,7 @@ class Select(
self._raw_columns = [
coercions.expect(roles.ColumnsClauseRole, c)
for c in coercions._expression_collection_was_a_list(
- "columns", "Select.with_only_columns", entities
+ "entities", "Select.with_only_columns", entities
)
]
return self