]> git.ipfire.org Git - thirdparty/psycopg.git/commitdiff
refactor(cursor): rename _set_current_result -> _select_current_result
authorDaniele Varrazzo <daniele.varrazzo@gmail.com>
Sun, 24 Jul 2022 00:37:56 +0000 (01:37 +0100)
committerDaniele Varrazzo <daniele.varrazzo@gmail.com>
Tue, 26 Jul 2022 12:01:42 +0000 (13:01 +0100)
psycopg/psycopg/cursor.py
psycopg/psycopg/server_cursor.py

index 77ad80788eb06b25ba35324f2f70aa46113888b4..2444706c067699987194177a5b55b608acc8a651 100644 (file)
@@ -168,7 +168,7 @@ class BaseCursor(Generic[ConnectionType, Row]):
         methods `!fetch*()` will operate on.
         """
         if self._iresult < len(self._results) - 1:
-            self._set_current_result(self._iresult + 1)
+            self._select_current_result(self._iresult + 1)
             return True
         else:
             return None
@@ -214,7 +214,7 @@ class BaseCursor(Generic[ConnectionType, Row]):
             assert results is not None
             self._check_results(results)
             self._results = results
-            self._set_current_result(0)
+            self._select_current_result(0)
 
         self._last_query = query
 
@@ -283,7 +283,7 @@ class BaseCursor(Generic[ConnectionType, Row]):
                 nrows += res.command_tuples or 0
 
         if self._results:
-            self._set_current_result(0)
+            self._select_current_result(0)
 
         # Override rowcount for the first result. Calls to nextset() will change
         # it to the value of that result only, but we hope nobody will notice.
@@ -515,7 +515,9 @@ class BaseCursor(Generic[ConnectionType, Row]):
                 "unexpected result status from query:" f" {pq.ExecStatus(status).name}"
             )
 
-    def _set_current_result(self, i: int, format: Optional[pq.Format] = None) -> None:
+    def _select_current_result(
+        self, i: int, format: Optional[pq.Format] = None
+    ) -> None:
         """
         Select one of the results in the cursor as the active one.
         """
@@ -540,14 +542,14 @@ class BaseCursor(Generic[ConnectionType, Row]):
             # Received from execute()
             self._results.extend(results)
             if first_batch:
-                self._set_current_result(0)
+                self._select_current_result(0)
 
         else:
             # Received from executemany()
             if self._execmany_returning:
                 self._results.extend(results)
                 if first_batch:
-                    self._set_current_result(0)
+                    self._select_current_result(0)
                     self._rowcount = 0
 
             # Override rowcount for the first result. Calls to nextset() will
index 0e77a6fdda9b82b567981b52fe5a119c3bd1acf3..058cf9327749db8c584980095291d9da59823b34 100644 (file)
@@ -113,7 +113,7 @@ class ServerCursorMixin(BaseCursor[ConnectionType, Row]):
         results = yield from execute(self._pgconn)
         self._check_results(results)
         self._results = results
-        self._set_current_result(0, format=self._format)
+        self._select_current_result(0, format=self._format)
         self._described = True
 
     def _close_gen(self) -> PQGen[None]: