Fix iUtil vtable; new temp_database context manager

Author: pcisar

docs/changelog.txt

@@ -2,6 +2,12 @@
 Changelog
 #########
 
+Version 1.3.2
+=============
+
+* Fix unregistered bug: iUtil methods removed after FB 4 Beta 2 broke the Int128/TZ handling.
+* New context manager `.temp_database`.
+
 Version 1.3.1
 =============
 

docs/conf.py

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

docs/ref-core.txt

@@ -23,6 +23,10 @@ transaction
 -----------
 .. autofunction:: transaction
 
+temp_database
+-------------
+.. autofunction:: temp_database
+
 Functions
 =========
 

firebird/driver/__init__.py

@@ -35,7 +35,7 @@
 
 
 """
-from .config import driver_config
+from .config import driver_config, ServerConfig, DatabaseConfig, DriverConfig
 from .fbapi import load_api, get_api
 from .types import Error, InterfaceError, DatabaseError, DataError, \
      OperationalError, IntegrityError, InternalError, ProgrammingError, \
@@ -54,9 +54,9 @@
      DESCRIPTION_SCALE, DESCRIPTION_NULL_OK, Date, Time, Timestamp, DateFromTicks, \
      TimeFromTicks, TimestampFromTicks, STRING, BINARY, NUMBER, DATETIME, ROWID, \
      get_timezone
-from .core import connect, create_database, connect_server, transaction, tpb, TPB, \
-     CHARSET_MAP, DistributedTransactionManager, Connection, Cursor, \
+from .core import connect, create_database, connect_server, transaction, temp_database, \
+     tpb, TPB, CHARSET_MAP, DistributedTransactionManager, Connection, Cursor, \
      Server, Statement
 
 #: Current driver version, SEMVER string.
-__VERSION__ = '1.3.1'
+__VERSION__ = '1.3.2'

firebird/driver/core.py

@@ -264,6 +264,22 @@ def transaction(transact_object: Transactional, *, tpb: bytes=None,
         else:
             transact_object.commit()
 
+@contextlib.contextmanager
+def temp_database(*args, **kwargs) -> Connection:
+    """Context manager for temporary databases. Creates new database when context
+    is entered, and drops it on exit. Exception raised in managed context is NOT suppressed.
+
+    All positional and keyword arguments are passed to `create_database`.
+    """
+    con = create_database(*args, **kwargs)
+    try:
+        yield con
+    except:
+        con.drop_database()
+        raise
+    else:
+        con.drop_database()
+
 _OP_DIE = object()
 _OP_RECORD_AND_REREGISTER = object()
 
@@ -3617,9 +3633,10 @@ def callproc(self, proc_name: str, parameters: Sequence=None) -> None:
         .. note::
 
            If stored procedure does have output parameters, you must retrieve their values
-           saparatelly by `.Cursor.fetchone()` call. This method is not very convenient, but conforms
-           to Python DB API 2.0. If you don't require conformance to Python DB API, it's recommended
-           to use more convenient method `.Cursor.call_procedure()` instead.
+           saparatelly by `.Cursor.fetchone()` call. This method is not very convenient,
+           but conforms to Python DB API 2.0. If you don't require conformance to Python
+           DB API, it's recommended to use more convenient method `.Cursor.call_procedure()`
+           instead.
         """
         params = [] if parameters is None else parameters
         sql = ('EXECUTE PROCEDURE ' + proc_name + ' '

firebird/driver/fbapi.py

@@ -1696,8 +1696,6 @@ class IInt128_struct(Structure):
     ('setOffsets', IUtil_setOffsets),
     ('getDecFloat16', IUtil_getDecFloat16),
     ('getDecFloat34', IUtil_getDecFloat34),
-    ('getTransactionByHandle', c_void_p), # FB 4 Beta 2
-    ('getStatementByHandle', c_void_p), # FB 4 Beta 2
     ('decodeTimeTz', IUtil_decodeTimeTz),
     ('decodeTimeStampTz', IUtil_decodeTimeStampTz),
     ('encodeTimeTz', IUtil_encodeTimeTz),

setup.cfg

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