From: Denis Laxalde <denis.laxalde@dalibo.com>
Date: Thu, 2 Dec 2021 15:28:29 +0000 (+0100)
Subject: Simplify query preparation cases
X-Git-Tag: 3.1~146^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a4d5fdcfa308888ead0e60595e4bd8961a9f38b;p=thirdparty%2Fpsycopg.git

Simplify query preparation cases

Eliminate on 'if' in order to only emit a single
self._send_query_prepared() call.
---

diff --git a/psycopg/psycopg/cursor.py b/psycopg/psycopg/cursor.py
index e82372dc0..7709454d1 100644
--- a/psycopg/psycopg/cursor.py
+++ b/psycopg/psycopg/cursor.py
@@ -246,20 +246,17 @@ class BaseCursor(Generic[ConnectionType, Row]):
     ) -> PQGen[List["PGresult"]]:
         # Check if the query is prepared or needs preparing
         prep, name = self._conn._prepared.get(pgq, prepare)
-        if prep is Prepare.YES:
-            # The query is already prepared
-            self._send_query_prepared(name, pgq, binary=binary)
-
-        elif prep is Prepare.NO:
+        if prep is Prepare.NO:
             # The query must be executed without preparing
             self._execute_send(pgq, binary=binary)
-
         else:
-            # The query must be prepared and executed
-            self._send_prepare(name, pgq)
-            (result,) = yield from execute(self._pgconn)
-            if result.status == ExecStatus.FATAL_ERROR:
-                raise e.error_from_result(result, encoding=self._encoding)
+            # If the query is not already prepared, prepare it.
+            if prep is Prepare.SHOULD:
+                self._send_prepare(name, pgq)
+                (result,) = yield from execute(self._pgconn)
+                if result.status == ExecStatus.FATAL_ERROR:
+                    raise e.error_from_result(result, encoding=self._encoding)
+            # Then execute it.
             self._send_query_prepared(name, pgq, binary=binary)
 
         # run the query