Fix mangled DbInfoCode items

Author: pcisar

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+- Mangled output for `DbInfoCode` itsens `CRYPT_PLUGIN`, `WIRE_CRYPT`, `DB_GUID` and `DB_FILE_ID`
 - #34 - Pre-1970 dates causes OverflowError
 - #38 - 'datetime.date' object has no attribute 'date'
 

docs/changelog.txt

@@ -2,6 +2,13 @@
 Changelog
 #########
 
+Version 1.10.2
+==============
+
+* Fix: mangled output for `.DbInfoCode` itsens `CRYPT_PLUGIN`, `WIRE_CRYPT`, `DB_GUID` and `DB_FILE_ID`
+* Fix: #34 - Pre-1970 dates causes OverflowError
+* Fix: #38 - 'datetime.date' object has no attribute 'date'
+
 Version 1.10.1
 ==============
 

docs/requirements.txt

@@ -1,4 +1,4 @@
 sphinx-bootstrap-theme>=0.8.1
 sphinx-autodoc-typehints>=1.24.0
-sphinx>=5.3
+sphinx==7.2.6
 .

pyproject.toml

@@ -82,7 +82,7 @@ python = ["3.8", "3.9", "3.10", "3.11"]
 detached = false
 platforms = ["linux"]
 dependencies = [
-  "Sphinx>=7.1",
+  "Sphinx==7.2.6",
   "sphinx-bootstrap-theme>=0.8.1",
   "sphinx-autodoc-typehints>=1.24.0",
   "doc2dash>=3.0.0"

src/firebird/driver/__init__.py

@@ -61,4 +61,4 @@
      Server, Statement)
 
 #: Current driver version, SEMVER string.
-__VERSION__ = '1.10.1'
+__VERSION__ = '1.10.2'

src/firebird/driver/core.py

@@ -1154,7 +1154,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._single_info_string,
              DbInfoCode.CRYPT_STATE: self.__crypt_state,
              DbInfoCode.CONN_FLAGS: self.__con_state,
              DbInfoCode.BACKOUT_COUNT: self.__tbl_perf_count,
@@ -1198,6 +1198,9 @@ def _info_string(self) -> str:
         self.response.read_byte()  # Cluster length
         self.response.read_short()  # number of strings
         return self.response.read_pascal_string()
+    def _single_info_string(self) -> str:
+        self.response.read_byte()  # Cluster length
+        return self.response.read_pascal_string()
     def __user_names(self) -> Dict[str, str]:
         self.response.rewind() # necessary to process names separated by info tag
         usernames = []
@@ -1559,14 +1562,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._single_info_string,
             DbInfoCode.CREATION_TIMESTAMP_TZ: self.__creation_tstz,
-            DbInfoCode.WIRE_CRYPT: self._info_string,
+            DbInfoCode.WIRE_CRYPT: self._single_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._single_info_string,
+            DbInfoCode.DB_FILE_ID: self._single_info_string,
             DbInfoCode.REPLICA_MODE: self.__replica_mode,
         })
     def __creation_tstz(self) -> datetime.datetime:
@@ -4974,7 +4977,7 @@ class ServerDbServices(ServerDbServices4):
     """Database-related actions and services [Firebird 5+].
     """
     def upgrade(self, *, database: FILESPEC) -> bytes:
-        """Perform database repair operation.  **(SYNC service)**
+        """Perform database ODS upgrade operation.  **(SYNC service)**
 
         Arguments:
             database: Database specification or alias.
@@ -5501,7 +5504,7 @@ def info(self) -> ServerInfoProvider:
             self.__info = ServerInfoProvider(self.encoding, self)
         return self.__info
     @property
-    def database(self) -> Union[ServerDbServices3, ServerDbServices]:
+    def database(self) -> Union[ServerDbServices4, ServerDbServices3, ServerDbServices]:
         """Access to various database-related actions and services.
         """
         if self.__dbsvc is None: