Fix handling of v5 stmt info codes

Author: pcisar

src/firebird/driver/core.py

@@ -1353,7 +1353,7 @@ def get_info(self, info_code: DbInfoCode, page_number: int=None) -> Any:
             elif tag == isc_info_error:  # pragma: no cover
                 raise InterfaceError("An error response was received")
             else:  # pragma: no cover
-                raise InterfaceError("Result code does not match request code")
+                raise InterfaceError(f"Result code does not match request code {info_code}")
         #
         if info_code in (DbInfoCode.ACTIVE_TRANSACTIONS, DbInfoCode.LIMBO):
             # we'll rewind back, otherwise it will break the repeating cluster processing
@@ -2357,12 +2357,13 @@ def get_info(self, info_code: TraInfoCode) -> Any:
         """
         if info_code not in self._handlers:
             raise NotSupportedError(f"Info code {info_code} not supported by engine version {self._mngr()._connection()._engine_version()}")
+        self.response.clear()
         request = bytes([info_code])
         self._get_data(request)
         tag = self.response.get_tag()
         if request[0] != tag:
             raise InterfaceError("An error response was received" if tag == isc_info_error
-                                 else "Result code does not match request code")
+                                 else f"Result code does not match request code {info_code}")
         #
         return self._handlers[info_code]()
     # Functions
@@ -2799,13 +2800,15 @@ def get_info(self, info_code: StmtInfoCode) -> Any:
         """
         if info_code not in self._handlers:
             raise NotSupportedError(f"Info code {info_code} not supported by engine version {self._stmt()._connection()._engine_version()}")
+        self.response.clear()
         request = bytes([info_code])
         self._get_data(request)
+        if self.response.is_eof():
+            return None
         tag = self.response.get_tag()
         if request[0] != tag:
             raise InterfaceError("An error response was received" if tag == isc_info_error
-                                 else "Result code does not match request code")
-        #
+                                 else f"Result code does not match request code {info_code}")
         return self._handlers[info_code]()
 
 class StatementInfoProvider4(StatementInfoProvider3):

tests/test_info_providers.py

@@ -42,6 +42,10 @@
 @pytest.fixture()
 def prepared_statement(db_connection):
     """Provides a prepared statement for statement info tests."""
+    # This is needed for StmtInfoCode.EXEC_PATH_BLR_BYTES and EXEC_PATH_BLR_TEXT to work
+    with db_connection.cursor() as cur:
+        cur.execute('set debug option dsql_keep_blr = true')
+    db_connection.commit()
     # Need a transaction active for prepare
     with db_connection.transaction_manager() as tm:
         with tm.cursor() as cur: