From: Federico Caselli <cfederico87@gmail.com>
Date: Mon, 23 Sep 2024 21:11:06 +0000 (+0200)
Subject: Link scalar result method in scalar_one / scalar_one_or_none
X-Git-Tag: rel_2_0_36~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d34901ddac1466851c09d1f6f7ec32966e6fe44f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Link scalar result method in scalar_one / scalar_one_or_none

References: #11919

Change-Id: Iccbcd3fc3a6143be902683837b36260e5dd31c60
(cherry picked from commit 74e8e777f9aab33830d0625ef03d4a349cab24f4)
---

diff --git a/lib/sqlalchemy/engine/result.py b/lib/sqlalchemy/engine/result.py
index 56b3a68bc6..5ff41f1cbd 100644
--- a/lib/sqlalchemy/engine/result.py
+++ b/lib/sqlalchemy/engine/result.py
@@ -1452,11 +1452,11 @@ class Result(_WithKeys, ResultInternal[Row[_TP]]):
         """Return exactly one scalar result or raise an exception.
 
         This is equivalent to calling :meth:`_engine.Result.scalars` and
-        then :meth:`_engine.Result.one`.
+        then :meth:`_engine.ScalarResult.one`.
 
         .. seealso::
 
-            :meth:`_engine.Result.one`
+            :meth:`_engine.ScalarResult.one`
 
             :meth:`_engine.Result.scalars`
 
@@ -1475,11 +1475,11 @@ class Result(_WithKeys, ResultInternal[Row[_TP]]):
         """Return exactly one scalar result or ``None``.
 
         This is equivalent to calling :meth:`_engine.Result.scalars` and
-        then :meth:`_engine.Result.one_or_none`.
+        then :meth:`_engine.ScalarResult.one_or_none`.
 
         .. seealso::
 
-            :meth:`_engine.Result.one_or_none`
+            :meth:`_engine.ScalarResult.one_or_none`
 
             :meth:`_engine.Result.scalars`
 
@@ -1917,11 +1917,11 @@ class TupleResult(FilterResult[_R], util.TypingOnly):
             """Return exactly one scalar result or raise an exception.
 
             This is equivalent to calling :meth:`_engine.Result.scalars`
-            and then :meth:`_engine.Result.one`.
+            and then :meth:`_engine.ScalarResult.one`.
 
             .. seealso::
 
-                :meth:`_engine.Result.one`
+                :meth:`_engine.ScalarResult.one`
 
                 :meth:`_engine.Result.scalars`
 
@@ -1940,11 +1940,11 @@ class TupleResult(FilterResult[_R], util.TypingOnly):
             """Return exactly one or no scalar result.
 
             This is equivalent to calling :meth:`_engine.Result.scalars`
-            and then :meth:`_engine.Result.one_or_none`.
+            and then :meth:`_engine.ScalarResult.one_or_none`.
 
             .. seealso::
 
-                :meth:`_engine.Result.one_or_none`
+                :meth:`_engine.ScalarResult.one_or_none`
 
                 :meth:`_engine.Result.scalars`
 
diff --git a/lib/sqlalchemy/ext/asyncio/result.py b/lib/sqlalchemy/ext/asyncio/result.py
index 7dcbe3280e..745a51b81b 100644
--- a/lib/sqlalchemy/ext/asyncio/result.py
+++ b/lib/sqlalchemy/ext/asyncio/result.py
@@ -333,11 +333,11 @@ class AsyncResult(_WithKeys, AsyncCommon[Row[_TP]]):
         """Return exactly one scalar result or raise an exception.
 
         This is equivalent to calling :meth:`_asyncio.AsyncResult.scalars` and
-        then :meth:`_asyncio.AsyncResult.one`.
+        then :meth:`_asyncio.AsyncScalarResult.one`.
 
         .. seealso::
 
-            :meth:`_asyncio.AsyncResult.one`
+            :meth:`_asyncio.AsyncScalarResult.one`
 
             :meth:`_asyncio.AsyncResult.scalars`
 
@@ -356,11 +356,11 @@ class AsyncResult(_WithKeys, AsyncCommon[Row[_TP]]):
         """Return exactly one scalar result or ``None``.
 
         This is equivalent to calling :meth:`_asyncio.AsyncResult.scalars` and
-        then :meth:`_asyncio.AsyncResult.one_or_none`.
+        then :meth:`_asyncio.AsyncScalarResult.one_or_none`.
 
         .. seealso::
 
-            :meth:`_asyncio.AsyncResult.one_or_none`
+            :meth:`_asyncio.AsyncScalarResult.one_or_none`
 
             :meth:`_asyncio.AsyncResult.scalars`
 
@@ -869,11 +869,11 @@ class AsyncTupleResult(AsyncCommon[_R], util.TypingOnly):
             """Return exactly one scalar result or raise an exception.
 
             This is equivalent to calling :meth:`_engine.Result.scalars`
-            and then :meth:`_engine.Result.one`.
+            and then :meth:`_engine.AsyncScalarResult.one`.
 
             .. seealso::
 
-                :meth:`_engine.Result.one`
+                :meth:`_engine.AsyncScalarResult.one`
 
                 :meth:`_engine.Result.scalars`
 
@@ -892,11 +892,11 @@ class AsyncTupleResult(AsyncCommon[_R], util.TypingOnly):
             """Return exactly one or no scalar result.
 
             This is equivalent to calling :meth:`_engine.Result.scalars`
-            and then :meth:`_engine.Result.one_or_none`.
+            and then :meth:`_engine.AsyncScalarResult.one_or_none`.
 
             .. seealso::
 
-                :meth:`_engine.Result.one_or_none`
+                :meth:`_engine.AsyncScalarResult.one_or_none`
 
                 :meth:`_engine.Result.scalars`