From aaa9b040cef9f040f53ff447b9a7a8e815e75673 Mon Sep 17 00:00:00 2001 From: Federico Caselli Date: Thu, 9 Dec 2021 22:41:47 +0100 Subject: [PATCH] Add ``scalars`` to Migration - ORM Usage table. Fixes #7407 Change-Id: I0ec7c0dd44dce3b907296824ee4e6103bc72a6dd (cherry picked from commit d692b11608f540e4d4df8f4127ee52a476e0e5e4) --- doc/build/changelog/migration_20.rst | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/doc/build/changelog/migration_20.rst b/doc/build/changelog/migration_20.rst index 8f35220d89..86c8b1a69b 100644 --- a/doc/build/changelog/migration_20.rst +++ b/doc/build/changelog/migration_20.rst @@ -1206,9 +1206,12 @@ following the table, and may include additional notes not summarized here. session.execute( select(User) ).scalars().all() + # or + session.scalars(select(User)).all() - :ref:`migration_20_unify_select` + :meth:`_orm.Session.scalars` :meth:`_engine.Result.scalars` * - :: @@ -1235,11 +1238,11 @@ following the table, and may include additional notes not summarized here. - :: - session.execute( + session.scalars( select(User). filter_by(name="some user"). limit(1) - ).scalars().first() + ).first() - :ref:`migration_20_unify_select` @@ -1253,7 +1256,7 @@ following the table, and may include additional notes not summarized here. - :: - session.execute( + session.scalars( select(User). options( joinedload(User.addresses) @@ -1289,12 +1292,12 @@ following the table, and may include additional notes not summarized here. - :: - session.execute( + session.scalars( select(User). from_statement( text("select * from users") ) - ).scalars().all() + ).all() - :ref:`orm_queryguide_selecting_text` -- 2.47.3