sqlalchemy-iris 0.16.1b1__tar.gz → 0.17.0__tar.gz

{sqlalchemy_iris-0.16.1b1 → sqlalchemy_iris-0.17.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sqlalchemy-iris
-Version: 0.16.1b1
+Version: 0.17.0
 Summary: InterSystems IRIS for SQLAlchemy
 Home-page: https://github.com/caretdev/sqlalchemy-iris
 Maintainer: CaretDev
@@ -23,6 +23,8 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: SQLAlchemy>=1.3
+Provides-Extra: intersystems
+Requires-Dist: intersystems-irispython==5.1.0; extra == "intersystems"
 Dynamic: requires-dist
 
 sqlalchemy-iris
@@ -40,6 +42,12 @@ will install them if they are not already in place. To install, just:
 pip install sqlalchemy-iris
 ```
 
+Or to use InterSystems official driver support
+
+```shell
+pip install sqlalchemy-iris[intersystems]
+```
+
 Usage
 ---
 
@@ -50,6 +58,20 @@ from sqlalchemy import create_engine
 engine = create_engine("iris://_SYSTEM:SYS@localhost:1972/USER")
 ```
 
+To use with Python Embedded mode, when run next to IRIS
+
+```python
+from sqlalchemy import create_engine
+engine = create_engine("iris+emb:///USER")
+```
+
+To use with InterSystems official driver, does not work in Python Embedded mode
+
+```python
+from sqlalchemy import create_engine
+engine = create_engine("iris+intersystems://_SYSTEM:SYS@localhost:1972/USER")
+```
+
 IRIS Cloud SQL requires SSLContext
 
 ```python

{sqlalchemy_iris-0.16.1b1 → sqlalchemy_iris-0.17.0}/README.md

@@ -13,6 +13,12 @@ will install them if they are not already in place. To install, just:
 pip install sqlalchemy-iris
 ```
 
+Or to use InterSystems official driver support
+
+```shell
+pip install sqlalchemy-iris[intersystems]
+```
+
 Usage
 ---
 
@@ -23,6 +29,20 @@ from sqlalchemy import create_engine
 engine = create_engine("iris://_SYSTEM:SYS@localhost:1972/USER")
 ```
 
+To use with Python Embedded mode, when run next to IRIS
+
+```python
+from sqlalchemy import create_engine
+engine = create_engine("iris+emb:///USER")
+```
+
+To use with InterSystems official driver, does not work in Python Embedded mode
+
+```python
+from sqlalchemy import create_engine
+engine = create_engine("iris+intersystems://_SYSTEM:SYS@localhost:1972/USER")
+```
+
 IRIS Cloud SQL requires SSLContext
 
 ```python

{sqlalchemy_iris-0.16.1b1 → sqlalchemy_iris-0.17.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = sqlalchemy-iris
-version = 0.16.1b1
+version = 0.17.0
 description = InterSystems IRIS for SQLAlchemy
 long_description = file: README.md
 url = https://github.com/caretdev/sqlalchemy-iris
@@ -28,12 +28,17 @@ project_urls =
 python_requires = >=3.8
 packages = find:
 
+[options.extras_require]
+intersystems = 
+	intersystems-irispython==5.1.0
+
 [tool:pytest]
 addopts = --tb native -v -r fxX --maxfail=25 -p no:warnings
 
 [db]
 default = iris://_SYSTEM:SYS@localhost:1972/USER
 iris = iris://_SYSTEM:SYS@localhost:1972/USER
+irisintersystems = iris+intersystems://_SYSTEM:SYS@localhost:1972/USER
 irisasync = iris+irisasync://_SYSTEM:SYS@localhost:1972/USER
 irisemb = iris+emb:///
 sqlite = sqlite:///:memory:

{sqlalchemy_iris-0.16.1b1 → sqlalchemy_iris-0.17.0}/setup.py

@@ -9,6 +9,7 @@ setup(
             "iris = sqlalchemy_iris.iris:IRISDialect_iris",
             "iris.emb = sqlalchemy_iris.embedded:IRISDialect_emb",
             "iris.irisasync = sqlalchemy_iris.irisasync:IRISDialect_irisasync",
+            "iris.intersystems = sqlalchemy_iris.intersystems:IRISDialect_intersystems",
         ]
     },
 )

{sqlalchemy_iris-0.16.1b1 → sqlalchemy_iris-0.17.0}/sqlalchemy_iris/__init__.py

@@ -4,11 +4,11 @@ from . import base
 from . import iris
 
 try:
-    import alembic
+    import alembic # noqa
 except ImportError:
     pass
 else:
-    from .alembic import IRISImpl
+    from .alembic import IRISImpl # noqa
 
 from .base import BIGINT
 from .base import BIT
@@ -32,6 +32,7 @@ base.dialect = dialect = iris.dialect
 _registry.register("iris.iris", "sqlalchemy_iris.iris", "IRISDialect_iris")
 _registry.register("iris.emb", "sqlalchemy_iris.embedded", "IRISDialect_emb")
 _registry.register("iris.irisasync", "sqlalchemy_iris.irisasync", "IRISDialect_irisasync")
+_registry.register("iris.intersystems", "sqlalchemy_iris.intersystems", "IRISDialect_intersystems")
 
 __all__ = [
     "BIGINT",

{sqlalchemy_iris-0.16.1b1 → sqlalchemy_iris-0.17.0}/sqlalchemy_iris/base.py

@@ -900,6 +900,7 @@ class IRISDialect(default.DefaultDialect):
     type_compiler = IRISTypeCompiler
     execution_ctx_cls = IRISExecutionContext
 
+    update_returning = False
     insert_returning = True
     insert_executemany_returning = True
     insert_executemany_returning_sort_by_parameter_order = True
@@ -1090,7 +1091,10 @@ There are no access to %Dictionary, may be required for some advanced features,
         if query.endswith(";"):
             query = query[:-1]
         self._debug(query, params)
-        cursor.execute(query, params)
+        try:
+            cursor.execute(query, params)
+        except Exception as ex:
+            raise ex
 
     def do_executemany(self, cursor, query, params, context=None):
         if query.endswith(";"):

sqlalchemy_iris-0.17.0/sqlalchemy_iris/intersystems/__init__.py

@@ -0,0 +1,167 @@
+import re
+import pkg_resources
+from ..base import IRISDialect
+from sqlalchemy import text, util
+from ..base import IRISExecutionContext
+from . import dbapi
+from .dbapi import connect, Cursor
+from .cursor import InterSystemsCursorFetchStrategy
+from .dbapi import IntegrityError, OperationalError, DatabaseError
+
+
+def remap_exception(func):
+    def wrapper(cursor, *args, **kwargs):
+        attempt = 0
+        while attempt < 3:
+            attempt += 1
+            try:
+                cursor.sqlcode = 0
+                return func(cursor, *args, **kwargs)
+            except RuntimeError as ex:
+                # [SQLCODE: <-119>:...
+                message = ex.args[0]
+                if '<LIST ERROR>' in message:
+                    # just random error happens in the driver, try again
+                    continue
+                sqlcode = re.findall(r"^\[SQLCODE: <(-\d+)>:", message)
+                if not sqlcode:
+                    raise Exception(message)
+                sqlcode = int(sqlcode[0])
+                if abs(sqlcode) in [108, 119, 121, 122]:
+                    raise IntegrityError(message)
+                if abs(sqlcode) in [1, 12]:
+                    raise OperationalError(message)
+                raise DatabaseError(message)
+
+    return wrapper
+
+
+class InterSystemsExecutionContext(IRISExecutionContext):
+    cursor_fetch_strategy = InterSystemsCursorFetchStrategy()
+
+    def create_cursor(self):
+        cursor = self._dbapi_connection.cursor()
+        cursor.sqlcode = 0
+        return cursor
+
+
+class IRISDialect_intersystems(IRISDialect):
+    driver = "intersystems"
+
+    execution_ctx_cls = InterSystemsExecutionContext
+
+    supports_statement_cache = True
+
+    supports_cte = False
+
+    supports_sane_rowcount = False
+    supports_sane_multi_rowcount = False
+
+    insert_returning = False
+    insert_executemany_returning = False
+
+    logfile = None
+
+    def __init__(self, logfile: str = None, **kwargs):
+        self.logfile = logfile
+        IRISDialect.__init__(self, **kwargs)
+
+    @classmethod
+    def import_dbapi(cls):
+        return dbapi
+
+    def connect(self, *cargs, **kwarg):
+        host = kwarg.get("hostname", "localhost")
+        port = kwarg.get("port", 1972)
+        namespace = kwarg.get("namespace", "USER")
+        username = kwarg.get("username", "_SYSTEM")
+        password = kwarg.get("password", "SYS")
+        timeout = kwarg.get("timeout", 10)
+        sharedmemory = kwarg.get("sharedmemory", False)
+        logfile = kwarg.get("logfile", self.logfile)
+        sslconfig = kwarg.get("sslconfig", False)
+        autoCommit = kwarg.get("autoCommit", False)
+        isolationLevel = kwarg.get("isolationLevel", 1)
+        return connect(
+            host,
+            port,
+            namespace,
+            username,
+            password,
+            timeout,
+            sharedmemory,
+            logfile,
+            sslconfig,
+            autoCommit,
+            isolationLevel,
+        )
+
+    def create_connect_args(self, url):
+        opts = {}
+
+        opts["application_name"] = "sqlalchemy"
+        opts["host"] = url.host
+        opts["port"] = int(url.port) if url.port else 1972
+        opts["namespace"] = url.database if url.database else "USER"
+        opts["username"] = url.username if url.username else ""
+        opts["password"] = url.password if url.password else ""
+
+        opts["autoCommit"] = False
+
+        if opts["host"] and "@" in opts["host"]:
+            _h = opts["host"].split("@")
+            opts["password"] += "@" + _h[0 : len(_h) - 1].join("@")
+            opts["host"] = _h[len(_h) - 1]
+
+        return ([], opts)
+
+    def _get_server_version_info(self, connection):
+        # get the wheel version from iris module
+        try:
+            return tuple(
+                map(
+                    int,
+                    pkg_resources.get_distribution(
+                        "intersystems_irispython"
+                    ).version.split("."),
+                )
+            )
+        except:  # noqa
+            return None
+
+    def _get_option(self, connection, option):
+        with connection.cursor() as cursor:
+            cursor.execute("SELECT %SYSTEM_SQL.Util_GetOption(?)", (option,))
+            row = cursor.fetchone()
+            if row:
+                return row[0]
+        return None
+
+    def set_isolation_level(self, connection, level_str):
+        if level_str == "AUTOCOMMIT":
+            connection.autocommit = True
+        else:
+            connection.autocommit = False
+            if level_str not in ["READ COMMITTED", "READ VERIFIED"]:
+                level_str = "READ UNCOMMITTED"
+            with connection.cursor() as cursor:
+                cursor.execute("SET TRANSACTION ISOLATION LEVEL " + level_str)
+
+    @remap_exception
+    def do_execute(self, cursor, query, params, context=None):
+        if query.endswith(";"):
+            query = query[:-1]
+        self._debug(query, params)
+        cursor.execute(query, params)
+
+    @remap_exception
+    def do_executemany(self, cursor, query, params, context=None):
+        if query.endswith(";"):
+            query = query[:-1]
+        self._debug(query, params, many=True)
+        if params and (len(params[0]) <= 1):
+            params = [param[0] if len(param) else None for param in params]
+        cursor.executemany(query, params)
+
+
+dialect = IRISDialect_intersystems

sqlalchemy_iris-0.17.0/sqlalchemy_iris/intersystems/cursor.py

@@ -0,0 +1,17 @@
+from typing import Any
+from sqlalchemy import CursorResult
+from sqlalchemy.engine.cursor import CursorFetchStrategy
+from sqlalchemy.engine.interfaces import DBAPICursor
+
+
+class InterSystemsCursorFetchStrategy(CursorFetchStrategy):
+
+    def fetchone(
+        self,
+        result: CursorResult[Any],
+        dbapi_cursor: DBAPICursor,
+        hard_close: bool = False,
+    ) -> Any:
+        row = dbapi_cursor.fetchone()
+        return tuple(row) if row else None
+

sqlalchemy_iris-0.17.0/sqlalchemy_iris/intersystems/dbapi.py

@@ -0,0 +1,67 @@
+try:
+    import iris
+
+    class Cursor(iris.irissdk.dbapiCursor):
+        pass
+
+    class DataRow(iris.irissdk.dbapiDataRow):
+        pass
+
+except ImportError:
+    pass
+
+
+def connect(*args, **kwargs):
+    return iris.connect(*args, **kwargs)
+
+
+# globals
+apilevel = "2.0"
+threadsafety = 0
+paramstyle = "qmark"
+
+Binary = bytes
+STRING = str
+BINARY = bytes
+NUMBER = float
+ROWID = str
+
+
+class Error(Exception):
+    pass
+
+
+class Warning(Exception):
+    pass
+
+
+class InterfaceError(Error):
+    pass
+
+
+class DatabaseError(Error):
+    pass
+
+
+class InternalError(DatabaseError):
+    pass
+
+
+class OperationalError(DatabaseError):
+    pass
+
+
+class ProgrammingError(DatabaseError):
+    pass
+
+
+class IntegrityError(DatabaseError):
+    pass
+
+
+class DataError(DatabaseError):
+    pass
+
+
+class NotSupportedError(DatabaseError):
+    pass