Release 1.3.3

Author: pcisar

docs/changelog.txt

@@ -2,6 +2,15 @@
 Changelog
 #########
 
+Version 1.3.3
+=============
+
+* Fix unregistered bug: Newly extended interface breaks the driver (affects usability of
+  the driver with Firebird development versions).
+* New exception type `.FirebirdWarning`. From now on, warnings from engine are raised as
+  `.FirebirdWarning` instead `Warning`. In some future release, warnings will not be raised,
+  but reported via `warnings.warn` mechanism.
+
 Version 1.3.2
 =============
 

docs/ref-types.txt

@@ -48,10 +48,15 @@ NotSupportedError
 -----------------
 .. autoexception:: NotSupportedError
 
+FirebirdWarning
+---------------
+.. autoexception:: FirebirdWarning
+
 This is the exception inheritance layout::
 
     StandardError
     |__Warning
+        |__FirebirdWarning
     |__Error
         |__InterfaceError
         |__DatabaseError

firebird/driver/__init__.py

@@ -39,7 +39,7 @@
 from .fbapi import load_api, get_api
 from .types import Error, InterfaceError, DatabaseError, DataError, \
      OperationalError, IntegrityError, InternalError, ProgrammingError, \
-     NotSupportedError, \
+     NotSupportedError, FirebirdWarning, \
      NetProtocol, DirectoryCode, PageSize, DBKeyScope, DbInfoCode, Features, ReplicaMode, \
      StmtInfoCode, TraInfoCode, TraInfoIsolation, TraInfoReadCommitted, \
      TraInfoAccess, TraIsolation, TraReadCommitted, TraLockResolution, TraAccessMode, \

firebird/driver/core.py

@@ -414,7 +414,7 @@ def __init__(self, *, user: str=None, password: str=None, role: str=None,
         # Available options:
         # AuthClient, WireCryptPlugin, Providers, ConnectionTimeout, WireCrypt,
         # WireConpression, DummyPacketInterval, RemoteServiceName, RemoteServicePort,
-        # RemoteAuxPort, TcpNoNagle, IpcName, RemotePipeName
+        # RemoteAuxPort, TcpNoNagle, IpcName, RemotePipeName, ClientBatchBuffer [FB4+]
         #: Configuration override
         self.config: Optional[str] = config
         #: List of authentication plugins override

firebird/driver/interfaces.py

@@ -39,9 +39,10 @@
 import sys
 import threading
 import datetime
+#from warnings import warn
 from ctypes import memmove, memset, create_string_buffer, cast, byref, string_at, sizeof, \
      c_char_p, c_void_p, c_byte, c_ulong
-from .types import Error, DatabaseError, InterfaceError, BCD, \
+from .types import Error, DatabaseError, InterfaceError, FirebirdWarning, BCD, \
      StateResult, DirectoryCode, BlobInfoCode, SQLDataType, XpbKind, \
      StatementType, StateFlag, CursorFlag, StatementFlag, PreparePrefetchFlag, get_timezone
 from . import fbapi as a
@@ -67,7 +68,7 @@ class iVersionedMeta(type):
     def __call__(cls: iVersioned, intf):
         v = intf.contents.vtable.contents.version
         for c in cls.__mro__:
-            if getattr(c, 'VERSION', 0) == v:
+            if getattr(c, 'VERSION', 0) <= v:
                 return super(iVersionedMeta, iVersionedMeta).__call__(c, intf)
 
 # IVersioned(1)
@@ -76,9 +77,9 @@ class iVersioned(metaclass=iVersionedMeta):
     VERSION = 1
     def __init__(self, intf):
         self._as_parameter_ = intf
-        if intf and self.vtable.version != self.VERSION:  # pragma: no cover
+        if intf and self.vtable.version < self.VERSION:  # pragma: no cover
             raise InterfaceError(f"Wrong interface version {self.vtable.version}, expected {self.VERSION}")
-    def __report(self, cls: Union[Error, Warning], vector_ptr: a.ISC_STATUS_ARRAY_PTR) -> None:
+    def __report(self, cls: Union[Error, FirebirdWarning], vector_ptr: a.ISC_STATUS_ARRAY_PTR) -> None:
         msg = _util.format_status(self.status)
         sqlstate = create_string_buffer(6)
         a.api.fb_sqlstate(sqlstate, vector_ptr)
@@ -103,7 +104,9 @@ def _check(self) -> None:
         if StateFlag.ERRORS in state:
             raise self.__report(DatabaseError, self.status.get_errors())
         if StateFlag.WARNINGS in state:  # pragma: no cover
-            raise self.__report(Warning, self.status.get_warning())
+            raise self.__report(FirebirdWarning, self.status.get_warning())
+            #warn(self.__report(FirebirdWarning, self.status.get_warning()).args[0],
+                 #FirebirdWarning, 2)
     @property
     def status(self) -> iStatus:
         "iStatus for interface"

firebird/driver/types.py

@@ -110,6 +110,12 @@ class NotSupportedError(DatabaseError):
     supported by the database.
     """
 
+# Firebird engine warning via Python Warning mechanism
+
+class FirebirdWarning(Warning):
+    """Warning from Firebird engine.
+    """
+
 # Enums
 
 class NetProtocol(IntEnum):

setup.cfg

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