Fix issue with Firebird 4 string dbinfo items

Author: pcisar

docs/changelog.txt

@@ -2,6 +2,11 @@
 Changelog
 #########
 
+Version 1.3.1
+=============
+
+* Fix unregistered bug: wrong handling of Firebird 4 string info parameters.
+
 Version 1.3.0
 =============
 

docs/conf.py

@@ -23,10 +23,10 @@
 author = 'Pavel Císař'
 
 # The short X.Y version
-version = '1.3.0'
+version = '1.3.1'
 
 # The full version, including alpha/beta/rc tags
-release = '1.3.0'
+release = '1.3.1'
 
 
 # -- General configuration ---------------------------------------------------

firebird/driver/__init__.py

@@ -59,4 +59,4 @@
      Server, Statement
 
 #: Current driver version, SEMVER string.
-__VERSION__ = '1.3.0'
+__VERSION__ = '1.3.1'

firebird/driver/core.py

@@ -1060,9 +1060,9 @@ def __init__(self, connection: Connection):
              DbInfoCode.DB_ID: self.__db_id,
              DbInfoCode.IMPLEMENTATION: self.__implementation,
              DbInfoCode.IMPLEMENTATION_OLD: self.__implementation_old,
-             DbInfoCode.VERSION: self.__info_string,
-             DbInfoCode.FIREBIRD_VERSION: self.__info_string,
-             DbInfoCode.CRYPT_KEY: self.__info_string,
+             DbInfoCode.VERSION: self._info_string,
+             DbInfoCode.FIREBIRD_VERSION: self._info_string,
+             DbInfoCode.CRYPT_KEY: self._info_string,
              DbInfoCode.USER_NAMES: self.__user_names,
              DbInfoCode.ACTIVE_TRANSACTIONS: self.__tra_active,
              DbInfoCode.LIMBO: self.__tra_limbo,
@@ -1102,7 +1102,7 @@ def __init__(self, connection: Connection):
              DbInfoCode.DB_PROVIDER: self.response.read_sized_int,
              DbInfoCode.PAGES_USED: self.response.read_sized_int,
              DbInfoCode.PAGES_FREE: self.response.read_sized_int,
-             DbInfoCode.CRYPT_KEY: self.__info_string,
+             DbInfoCode.CRYPT_KEY: self._info_string,
              DbInfoCode.CRYPT_STATE: self.__crypt_state,
              DbInfoCode.CONN_FLAGS: self.__con_state,
              DbInfoCode.BACKOUT_COUNT: self.__tbl_perf_count,
@@ -1142,7 +1142,7 @@ def __implementation_old(self) -> Tuple[int, int]:
         impl_number = self.response.read_byte()
         class_number = self.response.read_byte()
         return (impl_number, class_number)
-    def __info_string(self) -> str:
+    def _info_string(self) -> str:
         self.response.read_byte()  # Cluster length
         self.response.read_short()  # number of strings
         return self.response.read_pascal_string()
@@ -1507,14 +1507,14 @@ def __init__(self, connection: Connection):
             DbInfoCode.STMT_TIMEOUT_DB: self.response.read_sized_int,
             DbInfoCode.STMT_TIMEOUT_ATT: self.response.read_sized_int,
             DbInfoCode.PROTOCOL_VERSION: self.response.read_sized_int,
-            DbInfoCode.CRYPT_PLUGIN: self.__info_string,
+            DbInfoCode.CRYPT_PLUGIN: self._info_string,
             DbInfoCode.CREATION_TIMESTAMP_TZ: self.__creation_tstz,
-            DbInfoCode.WIRE_CRYPT: self.__info_string,
+            DbInfoCode.WIRE_CRYPT: self._info_string,
             DbInfoCode.FEATURES: self.__features,
             DbInfoCode.NEXT_ATTACHMENT: self.response.read_sized_int,
             DbInfoCode.NEXT_STATEMENT: self.response.read_sized_int,
-            DbInfoCode.DB_GUID: self.__info_string,
-            DbInfoCode.DB_FILE_ID: self.__info_string,
+            DbInfoCode.DB_GUID: self._info_string,
+            DbInfoCode.DB_FILE_ID: self._info_string,
             DbInfoCode.REPLICA_MODE: self.__replica_mode,
         })
     def __creation_tstz(self) -> datetime.datetime:

setup.cfg

@@ -5,7 +5,7 @@ all-files=True
 
 [metadata]
 name = firebird-driver
-version = 1.3.0
+version = 1.3.1
 description = Firebird driver
 long_description = file: README.rst
 long_description_content_type = text/x-rst; charset=UTF-8