From: Federico Caselli <cfederico87@gmail.com>
Date: Thu, 9 Dec 2021 21:41:47 +0000 (+0100)
Subject: Add ``scalars`` to Migration - ORM Usage table.
X-Git-Tag: rel_2_0_0b1~604^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d692b11608f540e4d4df8f4127ee52a476e0e5e4;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Add ``scalars`` to Migration - ORM Usage table.

Fixes #7407

Change-Id: I0ec7c0dd44dce3b907296824ee4e6103bc72a6dd
---

diff --git a/doc/build/changelog/migration_20.rst b/doc/build/changelog/migration_20.rst
index 5fdd093d0b..2ec9bc858f 100644
--- a/doc/build/changelog/migration_20.rst
+++ b/doc/build/changelog/migration_20.rst
@@ -1289,9 +1289,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`
 
     * - ::
@@ -1318,11 +1321,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`
 
@@ -1336,7 +1339,7 @@ following the table, and may include additional notes not summarized here.
 
       - ::
 
-            session.execute(
+            session.scalars(
                 select(User).
                 options(
                   joinedload(User.addresses)
@@ -1372,12 +1375,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`