mimerpy 1.3.0__tar.gz → 1.3.2__tar.gz

{mimerpy-1.3.0 → mimerpy-1.3.2}/PKG-INFO

@@ -1,10 +1,10 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.2
 Name: mimerpy
-Version: 1.3.0
+Version: 1.3.2
 Summary: Python database interface for Mimer SQL
 Author-email: Erik Gunne <mimerpy@mimer.com>, Magdalena Boström <mimerpy@mimer.com>, Mimer Information Technology AB <mimerpy@mimer.com>
 Maintainer-email: Mimer Information Technology AB <mimerpy@mimer.com>
-License-Expression: MIT
+License: MIT
 Project-URL: Homepage, https://developer.mimer.com/mimerpy
 Keywords: Mimer,MimerSQL,Database,SQL,PEP249
 Classifier: Development Status :: 5 - Production/Stable
@@ -21,7 +21,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.6
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
-Dynamic: license-file
+Requires-Dist: python-dateutil>=2.8.2; python_version < "3.7"
 
 MimerPy: Python database interface for Mimer SQL
 ==================================================

{mimerpy-1.3.0 → mimerpy-1.3.2}/doc/datatypes.rst

@@ -49,13 +49,19 @@ Overview of Mimer SQL to Python data types:
 +------------------------+--------------------+
 | NVARCHAR(n)            | Str                |
 +------------------------+--------------------+
-| DATE                   | Str                |
+| DATE                   | date               |
 +------------------------+--------------------+
-| TIME(s)                | Str                |
+| TIME(s)                | time               |
 +------------------------+--------------------+
-| TIMESTAMP(s)           | Str                |
+| TIMESTAMP(s)           | datetime           |
 +------------------------+--------------------+
-| UUID                   | uuid               |
+| BUILTIN.UUID           | uuid.UUID          |
++------------------------+--------------------+
+| BUILTIN.GIS_LOCATION   | (Float,Float)      |
++------------------------+--------------------+
+| BUILTIN.GIS_LATITUDE   | Float              |
++------------------------+--------------------+
+| BUILTIN.GIS_LONGITUDE  | Float              |
 +------------------------+--------------------+
 | INTERVAL               | Str                |
 +------------------------+--------------------+
@@ -269,9 +275,12 @@ DATE
 ----------
 DATE describes a date using the fields YEAR, MONTH and DAY in the format YYYY-MM-DD. It represents an absolute position on the timeline.
 
+DATE values are mapped to Python date objects. When inserting a DATE value, MimerPy also accepts strings in the format 'YYYY-MM-DD'.
 Example usage of ``DATE``::
 
  >>> cursor.execute("create table datetable (c1 DATE)")
+ >>> d = date.fromisoformat("2025-01-01")
+ >>> cursor.execute("insert INTO datetable VALUES (?)", (d))
  >>> data = "2020-09-24"
  >>> cursor.execute("insert INTO datetable VALUES (?)", (data))
 
@@ -279,24 +288,46 @@ TIME(s)
 ---------------
 TIME(s) describes a time in an unspecified day, with seconds precision s, using the fields HOUR, MINUTE and SECOND in the format HH:MM:SS[.sF] where F is the fractional part of the SECOND value. It represents an absolute time of day.
 
+TIME(s) values are mapped to Python time objects. When inserting a TIME value, MimerPy also accepts strings in the format 'HH:MM:SS[.ffffff]'.
+
 Example usage of ``TIME``::
 
  >>> cursor.execute("create table timetable (c1 TIME(0))")
- >>> time = "16:04:55"
- >>> cursor.execute("insert INTO timetable VALUES (?)", (time))
+ >>> t = time.fromisoformat("12:30:20")
+ >>> cursor.execute("insert INTO timetable VALUES (?)", (t))
+ >>> timestr = "16:04:55"
+ >>> cursor.execute("insert INTO timetable VALUES (?)", (timestr))
 
 TIMESTAMP(s) 
 ---------------------
 TIMESTAMP(s) describes both a date and time, with seconds precision s, using the fields YEAR, MONTH, DAY, HOUR, MINUTE and SECOND in the format YYYY-MM-DD HH:MM:SS[.sF]. F is the fractional part of the SECOND value. It represents an absolute position on the timeline.
 
+TIMESTAMP(s) values are mapped to Python datetime objects. When inserting a TIMESTAMP value, MimerPy also accepts strings in the format 'YYYY-MM-DD HH:MM:SS[.ffffff]'
+
 Example usage of ``TIMESTAMP``::
 
  >>> cursor.execute("create table timestamp_table(c1 TIMESTAMP(2))")
- >>> cursor.execute("insert into timestamp_table values (:a)", ('2020-09-17 11:21:51.12'))
+ >>> dt = datetime.fromisoformat('2020-09-17 11:21:51.12')
+ >>> cursor.execute("insert into timestamp_table values (:a)", (dt,))
+ >>> cursor.execute("insert into timestamp_table values (:a)", ('2021-01-01 23:12:50.12',))
 
 Universally Unique Identifier (UUID)
 ------------------------------------------
-Universally Unique Identifier is currently not implemented. 
+The Mimer SQL UUID data type BUILTIN.UUID is handled by the Python built-in uuid module.
+It is also possible to use strings and bytearrays to represent UUID values in MimerPy, but using the uuid module is recommended
+
+A BUILTIN.UUID is returned as a uuid.UUID object in Python.
+
+Example usage of ``BUILTIN.UUID``::
+
+  >>> import uuid
+  >>> cursor.execute("create table uuidtable (c1 BUILTIN.UUID)")
+  >>> uid = uuid.uuid4()
+  >>> uuid_byte = uid.bytes
+  >>> uuid_str = str(uid)
+  >>> cursor.execute("insert into uuidtable values (?)", (uid,))
+  >>> cursor.execute("insert into uuidtable values (?)", (uuid_byte,))
+  >>> cursor.execute("insert into uuidtable values (?)", (uuid_str,))
 
 INTERVAL 
 ------------
@@ -340,6 +371,26 @@ Consider the following example::
   >>> cursor.execute("create table intervaltable (c1 YEAR(5), c2 INTERVAL YEAR(5) TO MONTH)")
   >>> cursor.execute("insert into intervaltable values (?)", ("2021", "2021-05"))
 
+
+GIS_LOCATION, GIS_LATITUDE, and GIS_LONGITUDE 
+------------------------------------------------------------------------
+BUILTIN.GIS_LOCATION is used to store a geographic location as a pair of latitude and longitude coordinates.
+
+BUILTIN.GIS_LATITUDE is used to store the latitude coordinate and BUILTIN.GIS_LONGITUDE is used 
+to store the longitude coordinate of a geographic location.
+
+To work with BUILTIN.GIS_LOCATION in MimerPy, use a tuple with two float values representing latitude and longitude.
+BUILTIN.GIS_LATITUDE and BUILTIN.GIS_LONGITUDE are represented as float values in Python.
+MimerPy returns BUILTIN.GIS_LOCATION as a tuple of two float values, and BUILTIN.GIS_LATITUDE and BUILTIN.GIS_LONGITUDE as float values.
+
+Example usage of ``BUILTIN.GIS_LOCATION``, ``BUILTIN.GIS_LATITUDE``, and ``BUILTIN.GIS_LONGITUDE``::
+
+ >>> cursor.execute("create table gistable (loc BUILTIN.GIS_LOCATION, lat BUILTIN.GIS_LATITUDE, lon BUILTIN.GIS_LONGITUDE)")
+ >>> lat = 23.21
+ >>> lon = -45.67
+ >>> loc = (37.21, -51.62)
+ >>> cursor.execute("insert INTO gistable VALUES (?, ?, ?)", (loc, lat, lon))
+
 NULL 
 ------------
 The Python data type ``None`` is mapped to ``NULL`` in

{mimerpy-1.3.0 → mimerpy-1.3.2}/doc/gettingstarted.rst

@@ -9,7 +9,7 @@ running, please visit the `Mimer documentation`_.
 
 .. _Mimer documentation: https://developer.mimer.com/products/documentation/
 
-.. note:: MimerPy requires Python 3.5 or later. On Windows the command to run python3 varies between `python` and  `python3` depending on what versions you have installed. On Linux the command normally is `python3`. In this guide we use `python3` as command, but you might have to adjust for your environment.
+.. note:: MimerPy requires Python 3.6 or later. On Windows the command to run python3 varies between `python` and  `python3` depending on what versions you have installed. On Linux the command normally is `python3`. In this guide we use `python3` as command, but you might have to adjust for your environment.
 
 Checking the MimerPy installation
 ---------------------------------

{mimerpy-1.3.0 → mimerpy-1.3.2}/doc/index.rst

@@ -9,8 +9,7 @@ MimerPy -- Python database interface for Mimer SQL
 MimerPy is an adapter for Mimer SQL in Python_ which implements the `PEP 249`_
 specification.
 It allows the user to connect to Mimer SQL through Python, gaining access of the exceptional performance and powerful features provided by a Mimer SQL database.
-MimerPy is implemented as a CPython wrapper of the `Mimer SQL C API`_
-also known as Mimer API.
+MimerPy uses the `Mimer SQL C API`_ also known as Mimer API using `ctypes`.
 
 The following documentation covers the full interface of MimerPy,
 demonstrating how to

{mimerpy-1.3.0 → mimerpy-1.3.2}/doc/installationguide.rst

@@ -7,24 +7,11 @@ The following section covers how to install MimerPy.
 Requirements
 ------------------------
 
-MimerPy can currently run with Python3.5 or later, keep in mind
+MimerPy can currently run with Python3.6 or later, keep in mind
 to use the correct versions if you have multiple versions installed.
 
-If you are running on Ubuntu or Linux, some Python header files are needed for the installation. To install all the
-required files use the command:
-
-.. code-block:: console
-
-    $ sudo apt-get install python3-dev
-
-Alternatively you can download the Python-dev package in any preferable way.
-
-.. note:: The error “Python.h: No such file or directory”, is solved by downloading the -dev package.
-
 You need to install the Mimer SQL C API and have a Mimer SQL database server of version 11 or newer.
 
-.. note:: The error “mimerapi.h: No such file or directory”, is caused by Mimer SQL not being installed or a Mimer SQL version older than 11.
-
 .. _sec-SQL-api:
 
 Mimer SQL C API
@@ -63,14 +50,24 @@ To build MimerPy's source use the command:
 
 .. code-block:: console
 
-    $ python3 setup.py build
-    $ python3 setup.py install
+    $ python3 -m build
+    $ python3 -m pip install -e .
 
-If you wish to install the built distribution, you can download it from `PyPI`_ and then use pip to install:
+If you wish to install the release distribution manually, you can download it from `PyPI`_ and then use pip to install:
+
+To use the source distribution, use the command:
 
 .. code-block:: console
 
-  $ python3 -m pip install mimerpy-current.version.tar.gz
+  $ python3 -m pip install mimerpy-<version>.tar.gz
+
+You can also use the pre-built wheel file using the command:
+
+.. code-block:: console
+
+  $ python3 -m pip install mimerpy-<version>-py3-none-any.whl
+
+
 
 .. _GitHub: https://github.com/mimersql/MimerPy
 .. _PyPI: https://pypi.org/

{mimerpy-1.3.0 → mimerpy-1.3.2}/doc/introduction.rst

@@ -6,10 +6,10 @@ MimerPy is an adapter for Mimer SQL in Python_ which implements the
 Python Database API specfication `PEP 249`_.
 
 The adapter allows the user to access the powerful tools and
-advantages of Mimer SQL through Python.  MimerPy is implemented as a
-CPython wrapper of the `Mimer SQL C API`_.
+advantages of Mimer SQL through Python.  MimerPy uses `ctypes` to do
+dynamic binding to the `Mimer SQL C API`_.
 
-To use MimerPy, there is a minimum requirement of Python 3.5 or newer and
+To use MimerPy, there is a minimum requirement of Python 3.6 or newer and
 it is dependent on the `Mimer SQL C API`_.
 
 The Mimer SQL C API is a discrete C API that comes with Mimer SQL. The

mimerpy-1.3.2/doc/releasenotes.rst

@@ -0,0 +1,64 @@
+***************
+Release Notes
+***************
+
+.. _sec-release-notes:
+
+MimerPy Version 1.1
+-------------------
+MimerPy version 1.1 is the first public version.
+
+Known problems:
+
+* DDL and DML statments can not be mixed in one transaction.
+  DDL statements are always committed
+
+* DDL statements in a transaction can not be rolled back.
+
+* The methods :meth:`setinputsizes` and :meth:`setoutputsize` are not
+  implemented for cursors.
+
+* Accessing values with the type builtin.uuid in Mimer SQL requires a
+  MimerAPI of version 11.0.5B or later.
+
+* Accessing values with the type FLOAT(p) in Mimer SQL requires a
+  MimerAPI of version 11.0.5B or later.
+
+* Accessing integer values larger than 2**63 with the type INTEGER(p)
+  in Mimer SQL requires a MimerAPI of version 11.0.5B or later.
+
+* Using method :meth:`callproc` to call a Stored Procedure is not yet
+  supported.
+
+
+MimerPy Version 1.3.0
+---------------------
+MimerPy version 1.3.0 is a major release that uses `ctypes` and dynamic bindings
+to the Mimer SQL C API.
+
+Major changes:
+
+* MimerPy is now implemented using `ctypes` to access the Mimer SQL C API.
+  This removes the need for a C compiler on all platforms.
+* MimerPy now requires Python 3.6 or later.
+
+MimerPy Version 1.3.1
+---------------------
+MimerPy version 1.3.1 adds support for UUID and GIS datatypes in Mimer SQL and handles date, time, and timestamp correctly.
+
+Major changes:
+
+* Support for the UUID datatype BUILTIN.UUID added.
+* Support for GIS datatypes added. This include BUILTIN.GIS_LOCATION, BUILTIN.GIS_LATITUDE, and BUILTIN.GIS_LONGITUDE. This requires Mimer SQL version 11.0.8E or later.
+* Date are mapped to Python date objects. Strings in the format 'YYYY-MM-DD' are also accepted when inserting DATE values.
+* Time are mapped to Python time objects. Strings in the format 'HH:MM:SS[.ffffff]' are also accepted when inserting TIME values.
+* Timestamp are mapped to Python datetime objects. Strings in the format 'YYYY-MM-DD HH:MM:SS[.ffffff]' are also accepted when inserting TIMESTAMP values.
+
+MimerPy Version 1.3.2
+---------------------
+MimerPy version 1.3.2 is a minor buggfix release that fix a problem with datetime in Python version 3.9 and older
+
+Major changes:
+
+* Use a safe datetime and time parser
+* On Python 3.6, use dateutil module to parse ISO 8601 date strings

{mimerpy-1.3.0 → mimerpy-1.3.2}/doc/userguide.rst

@@ -5,7 +5,7 @@ User guide
 .. _mimer-syntax:
 
 This chapter of the documentation covers the relationship between
-MimerPy, Mimer SQL and the Mimer SQL C API.
+MimerPy and Mimer SQL.
 
 Connection parameters
 ---------------------

{mimerpy-1.3.0 → mimerpy-1.3.2}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=77", "setuptools-scm>=8", "wheel", "tomli; python_version<'3.11'"]
+requires = [ "setuptools>=68,<77", "setuptools-scm<8", "wheel"]
 build-backend = "setuptools.build_meta"
 
 
@@ -9,9 +9,10 @@ dynamic = ["version"]
 description = "Python database interface for Mimer SQL"
 readme = "README.rst"
 requires-python = ">=3.6"
-
-license = "MIT"
-license-files = ["LICENSE.txt"]
+dependencies = [
+    "python-dateutil>=2.8.2; python_version<'3.7'",
+]
+license = { text = "MIT" }
 authors = [
   { name = "Erik Gunne", email = "mimerpy@mimer.com" },
   { name = "Magdalena Boström", email = "mimerpy@mimer.com" },

{mimerpy-1.3.0 → mimerpy-1.3.2}/src/mimerpy/__init__.py

@@ -27,39 +27,25 @@ except ImportError:
 
 
 #
-# Set globals in mimerpy module and version in mimerapi module
+# Set globals in mimerpy module
 #
-from mimerpy import mimerapi
 import re
 
 apilevel = '2.0'
 threadsafety = '1'
 paramstyle = 'qmark'
-_v = re.findall(r'^\d+\.\d+\.\d+$', __version__)
-version = _v[0] if len(_v) else ''
-version_info = tuple([int(x) for x in version.split(".")]) if len(version) else ()
-mimerapi.__version__ = mimerapi.mimerAPIVersion().rstrip()
-
-
-#
-#  Check MimerAPI required version and set function level
-#
-from mimerpy.mimPyExceptions import *
-from mimerpy.mimPyExceptionHandler import mimerpy_error
-
-(_a, _b, _c, _d) = re.findall(r'^(\d+)\.(\d+)\.(\d)+(.)',
-                              mimerapi.__version__)[0]
-mimerapi._version_tuple = (int(_a), int(_b), int(_c), _d)
-if mimerapi._version_tuple < (11, 0, 5, 'A'):
-    raise NotSupportedError((-25101, mimerpy_error[-25101]))
-elif mimerapi._version_tuple < (11, 0, 5, 'B'):
-    # First supported version
-    mimerapi._level = 1
+# Accept both release and dev versions, e.g. 1.3.1.dev1+geb9c067d3.d20251016
+m = re.match(r'^(\d+\.\d+\.\d+)', __version__)
+if m:
+    version = m.group(1)
+    version_info = tuple(int(x) for x in version.split("."))
 else:
-    # String access to DECIMAL(p,s) and FLOAT(p). Map to Python decimal
-    mimerapi._level = 2
+    version = __version__
+    version_info = ()
 
 
+from mimerpy.mimPyExceptions import *
+from mimerpy.mimPyErrorCodes import mimerpy_error
 from mimerpy.connectionPy import Connection
 
 def connect(dsn='', user='', password='',

mimerpy-1.3.2/src/mimerpy/_version.py

@@ -0,0 +1,4 @@
+# file generated by setuptools_scm
+# don't change, don't track in version control
+__version__ = version = '1.3.2'
+__version_tuple__ = version_tuple = (1, 3, 2)

{mimerpy-1.3.0 → mimerpy-1.3.2}/src/mimerpy/connectionPy.py

@@ -20,10 +20,10 @@
 #
 # See license for more details.
 
-from mimerpy import mimerapi
+from . import mimerapi
 import weakref
-from mimerpy.cursorPy import *
-from mimerpy.mimPyExceptionHandler import *
+from .cursorPy import *
+from .mimPyExceptionHandler import *
 import sys
 
 def defaulterrorhandler(connection, cursor, errorclass, errorvalue):

{mimerpy-1.3.0 → mimerpy-1.3.2}/src/mimerpy/cursorPy.py

@@ -20,12 +20,15 @@
 #
 # See license for more details.
 
-from mimerpy.mimPyExceptionHandler import *
-from mimerpy import mimerapi
+from .mimPyExceptionHandler import *
+from . import mimerapi
 import collections, decimal, uuid
 from types import GeneratorType
-
-
+import uuid
+import string
+from datetime import date, time, datetime
+from mimerpy.utils import tolerant_fromiso_datetime, tolerant_fromiso_time
+    
 def _pythonSetDecimal(statement, cur_column, parameter):
     if parameter is None:
         rc = mimerapi.mimerSetString8(statement, cur_column, parameter)
@@ -69,7 +72,106 @@ def _pythonGetUUID(statement, col):
     return (rc, None)
 
 def _pythonSetUUID(statement, col, val):
-    return mimerapi.mimerSetUUID(statement, col, val.bytes)
+    if val is None:
+        return mimerapi.mimerSetUUID(statement, col, None)
+
+    if isinstance(val, uuid.UUID):
+        v = val.bytes
+    elif isinstance(val, (bytes, bytearray, memoryview)):
+        # allow raw 16-byte input
+        v = bytes(val)
+    elif isinstance(val, str):
+        # accepts both hyphenated and hex-only UUID strings
+        try:
+            v = uuid.UUID(val).bytes
+        except ValueError:
+            # invalid string representation
+            return mimerapi.MIMERPY_DATA_CONVERSION_ERROR
+    else:
+        # unsupported type
+        return mimerapi.MIMERPY_DATA_CONVERSION_ERROR
+
+    return mimerapi.mimerSetUUID(statement, col, v)
+
+def _pythonGetTimestamp(statement, col):
+    rc, val = mimerapi.mimerGetString8(statement, col)
+    if rc >= 0 and val is not None:
+        return (rc, tolerant_fromiso_datetime(val))
+    return (rc, None)
+
+def _pythonSetTimestamp(statement, col, val):
+    if val is None:
+        return mimerapi.mimerSetNull(statement, col)
+    if isinstance(val, datetime):
+        v = val.isoformat(sep=' ', timespec='microseconds')
+    elif isinstance(val, str):
+        try:
+            #Parse to ensure valid format but use orginal for higher precision
+            val = val.strip()
+            tolerant_fromiso_datetime(val)
+            v = val
+        except ValueError:
+            # invalid string representation
+            return mimerapi.MIMERPY_DATA_CONVERSION_ERROR
+    else:
+        # unsupported type
+        return mimerapi.MIMERPY_DATA_CONVERSION_ERROR
+
+    return mimerapi.mimerSetString8(statement, col, v)
+
+
+def _pythonGetTime(statement, col):
+    rc, val = mimerapi.mimerGetString8(statement, col)
+    if rc >= 0 and val is not None:
+        return (rc, tolerant_fromiso_time(val))
+    return (rc, None)
+
+def _pythonSetTime(statement, col, val):
+    if val is None:
+        return mimerapi.mimerSetNull(statement, col)
+    if isinstance(val, time):
+        v = val.isoformat(timespec='microseconds')
+    elif isinstance(val, str):
+        try:
+            #Parse to ensure valid format but use orginal for higher precision
+            val = val.strip()
+            tolerant_fromiso_time(val)
+            v = val
+        except ValueError:
+            # invalid string representation
+            return mimerapi.MIMERPY_DATA_CONVERSION_ERROR
+    else:
+        # unsupported type
+        return mimerapi.MIMERPY_DATA_CONVERSION_ERROR
+
+    return mimerapi.mimerSetString8(statement, col, v)
+
+def _pythonGetDate(statement, col):
+    rc, val = mimerapi.mimerGetString8(statement, col)
+    if rc >= 0 and val is not None:
+        return (rc, date.fromisoformat(val))
+    return (rc, None)
+
+def _pythonSetDate(statement, col, val):
+    if val is None:
+        return mimerapi.mimerSetNull(statement, col)
+    if isinstance(val, date):
+        v = val.isoformat()
+    elif isinstance(val, str):
+        try:
+            #Parse to ensure valid format
+            val = val.strip()
+            date.fromisoformat(val)
+            v = val
+        except ValueError:
+            # invalid string representation
+            return mimerapi.MIMERPY_DATA_CONVERSION_ERROR
+    else:
+        # unsupported type
+        return mimerapi.MIMERPY_DATA_CONVERSION_ERROR
+
+    return mimerapi.mimerSetString8(statement, col, v)
+
 
 def _define_funcs():
     global get_funcs
@@ -116,6 +218,12 @@ def _define_funcs():
                  58: mimerapi.mimerGetNclobData8,
                  59: mimerapi.mimerGetNclobData8,
                  8104: _pythonGetUUID,
+                 mimerapi.MIMER_TYPE_LOCATION: mimerapi.mimerGetGisLocation,
+                 mimerapi.MIMER_TYPE_LATITUDE: mimerapi.mimerGetGisLatitude,
+                 mimerapi.MIMER_TYPE_LONGITUDE: mimerapi.mimerGetGisLongitude,
+                 mimerapi.MIMER_TYPE_TIMESTAMP: _pythonGetTimestamp,
+                 mimerapi.MIMER_TYPE_TIME: _pythonGetTime,
+                 mimerapi.MIMER_TYPE_DATE: _pythonGetDate,
     }
 
     set_funcs = {1: mimerapi.mimerSetString8,
@@ -158,6 +266,12 @@ def _define_funcs():
                  59: mimerapi.mimerSetNclobData8,
                  501: mimerapi.mimerSetNull,
                  8104: _pythonSetUUID,
+                 mimerapi.MIMER_TYPE_LOCATION: mimerapi.mimerSetGisLocation,
+                 mimerapi.MIMER_TYPE_LATITUDE: mimerapi.mimerSetGisLatitude,
+                 mimerapi.MIMER_TYPE_LONGITUDE: mimerapi.mimerSetGisLongitude,
+                 mimerapi.MIMER_TYPE_TIMESTAMP: _pythonSetTimestamp,
+                 mimerapi.MIMER_TYPE_TIME: _pythonSetTime,
+                 mimerapi.MIMER_TYPE_DATE: _pythonSetDate,
     }
 
 _define_funcs()

mimerpy-1.3.0/src/mimerpy/mimPyExceptionHandler.py → mimerpy-1.3.2/src/mimerpy/mimPyErrorCodes.py

@@ -19,17 +19,27 @@
 # SOFTWARE.
 #
 # See license for more details.
-
-from mimerpy.mimPyExceptions import *
-from mimerpy import mimerapi
-
+"""
+Contains all MimerPy error code tables and mappings used by the exception system.
+Separated from mimPyExceptions and mimPyExceptionHandler to avoid circular imports.
+"""
+from .mimPyExceptions import (
+    DatabaseError, DataError, IntegrityError, InternalError,
+    InterfaceError, NotSupportedError, OperationalError,
+    ProgrammingError, TransactionAbortError
+)
+def _api_version_string():
+    try:
+        from mimerpy import mimerapi
+        return mimerapi.__version__
+    except Exception:
+        return "unknown"
+    
 # When adding new MimerAPI error codes:
 #  - Use the range -25xxx
 #  - Check the dictionaries below so that the right exception is thrown
 #  - Update env/gblsym/message.sym in the Mimer trunk
 #  - Update dbl/sdb/syscat.ddi in the Mimer trunk
-#  - Tell Jarl
-
 mimerpy_error = {
     -25000:"Unsupported method",
     -25001:"TPC is unsupported",
@@ -43,8 +53,8 @@ mimerpy_error = {
     -25020:"Data conversion error",
     -25030:"Out of memory",
     -25031:"Login failure",
-    -25101:("The operation requires Mimer API version 11.0.5A or newer. You have %s." % mimerapi.__version__),
-    -25102:("The operation requires Mimer API version 11.0.5B or newer. You have %s." % mimerapi.__version__),
+    -25101:("The operation requires Mimer API version 11.0.5A or newer. You have %s." % _api_version_string()),
+    -25102:("The operation requires Mimer API version 11.0.5B or newer. You have %s." % _api_version_string()),
 }
 
 py_error_nnnnn = {10001:TransactionAbortError,10003:TransactionAbortError,24010:DataError,24011:DataError
@@ -64,31 +74,4 @@ py_error_nnxxx = {10:DataError, 11:OperationalError, 12:ProgrammingError,
                   25:ProgrammingError, 26:InterfaceError,
                   27:DataError, 28: NotSupportedError}
 
-py_error_xxxxx = InternalError
-
-def get_error_class(rc):
-    """
-    Return a suitable error class from an error number.
-    """
-    rc = -rc;
-    if rc in py_error_nnnnn:
-        return py_error_nnnnn[rc]
-    rc = rc // 10
-    if rc in py_error_nnnnx:
-        return py_error_nnnnx[rc]
-    rc = rc // 100
-    if rc in py_error_nnxxx:
-        return py_error_nnxxx[rc]
-    return py_error_xxxxx
-
-
-def get_mimerapi_exception(rc, mimerapi_handle):
-    """
-    Return (errorclass, errorvalue) from a failed MimerAPI call.
-    """
-    if -25999 <= rc <= -25000:
-        return (get_error_class(rc), (rc, mimerpy_error[rc]))
-    (rc0, _, msg) = mimerapi.mimerGetError8(mimerapi_handle)
-    if rc0:
-        msg = "Unknown error %d" % rc
-    return (get_error_class(rc), (rc, msg))
+py_error_xxxxx = InternalError