diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2022-10-11 14:34:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2022-10-11 14:34:28 +0000 |
| commit | 4041dec5dab99f0b7351f322d942438b106aa467 (patch) | |
| tree | b3eb091c5f7f6c6b5a9512676718b3b0d49fa1b1 /lib/sqlalchemy | |
| parent | add6be2aac3ea39721d7464c61326f6b8f82bba2 (diff) | |
| parent | b580b425c37da7d0d4027e588bffcb876d979eb2 (diff) | |
| download | sqlalchemy-4041dec5dab99f0b7351f322d942438b106aa467.tar.gz | |
Merge "doc edits" into main
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/session.py | 5 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/selectable.py | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index 324ab7b25..c759f6541 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -2109,6 +2109,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 |