sqlalchemy-iris 0.17.1b3__py3-none-any.whl → 0.17.1b4__py3-none-any.whl

sqlalchemy_iris/base.py

@@ -971,11 +971,9 @@ There are no access to %Dictionary, may be required for some advanced features,
 
     def _get_option(self, connection, option):
         with connection.cursor() as cursor:
-            cursor.execute("SELECT %SYSTEM_SQL.Util_GetOption(?)", option)
+            cursor.execute("SELECT %SYSTEM_SQL.Util_GetOption(?)", (option, ))
             row = cursor.fetchone()
-            if row:
-                return row[0]
-        return None
+            return row[0] if row else None
 
     def _set_option(self, connection, option, value):
         with connection.cursor() as cursor:
@@ -1091,10 +1089,7 @@ There are no access to %Dictionary, may be required for some advanced features,
         if query.endswith(";"):
             query = query[:-1]
         self._debug(query, params)
-        try:
-            cursor.execute(query, params)
-        except Exception as ex:
-            raise ex
+        cursor.execute(query, params)
 
     def do_executemany(self, cursor, query, params, context=None):
         if query.endswith(";"):

sqlalchemy_iris/intersystems/__init__.py

@@ -1,11 +1,11 @@
 import re
+from typing import Any
 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 connect
 from .dbapi import IntegrityError, OperationalError, DatabaseError
+from sqlalchemy.engine.cursor import CursorFetchStrategy
 
 
 def remap_exception(func):
@@ -19,7 +19,7 @@ def remap_exception(func):
             except RuntimeError as ex:
                 # [SQLCODE: <-119>:...
                 message = ex.args[0]
-                if '<LIST ERROR>' in message:
+                if "<LIST ERROR>" in message:
                     # just random error happens in the driver, try again
                     continue
                 sqlcode = re.findall(r"^\[SQLCODE: <(-\d+)>:", message)
@@ -27,27 +27,34 @@ def remap_exception(func):
                     raise Exception(message)
                 sqlcode = int(sqlcode[0])
                 if abs(sqlcode) in [108, 119, 121, 122]:
-                    raise IntegrityError(message)
+                    raise IntegrityError(sqlcode, message)
                 if abs(sqlcode) in [1, 12]:
-                    raise OperationalError(message)
-                raise DatabaseError(message)
+                    raise OperationalError(sqlcode, message)
+                raise DatabaseError(sqlcode, message)
 
     return wrapper
 
 
+class InterSystemsCursorFetchStrategy(CursorFetchStrategy):
+
+    def fetchone(
+        self,
+        result,
+        dbapi_cursor,
+        hard_close: bool = False,
+    ) -> Any:
+        row = dbapi_cursor.fetchone()
+        return tuple(row) if row else None
+
+
 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
+    # execution_ctx_cls = InterSystemsExecutionContext
 
     supports_statement_cache = True
 
@@ -123,23 +130,19 @@ class IRISDialect_intersystems(IRISDialect):
             if super_ is not None:
                 super_(conn)
 
-                server_version = dbapi.createIRIS(conn).classMethodValue("%SYSTEM.Version", "GetNumber")
+                server_version = dbapi.createIRIS(conn).classMethodValue(
+                    "%SYSTEM.Version", "GetNumber"
+                )
                 server_version = server_version.split(".")
-                self.server_version = tuple([int("".join(filter(str.isdigit, v))) for v in server_version])
+                self.server_version = tuple(
+                    [int("".join(filter(str.isdigit, v))) for v in server_version]
+                )
 
         return on_connect
 
     def _get_server_version_info(self, connection):
         return self.server_version
 
-    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
@@ -150,6 +153,7 @@ class IRISDialect_intersystems(IRISDialect):
             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(";"):
@@ -166,5 +170,6 @@ class IRISDialect_intersystems(IRISDialect):
             params = [param[0] if len(param) else None for param in params]
         cursor.executemany(query, params)
 
+"""
 
 dialect = IRISDialect_intersystems

sqlalchemy_iris/requirements.py

@@ -960,8 +960,8 @@ class Requirements(SuiteRequirements, AlembicRequirements):
         literal string, e.g. via the TypeEngine.literal_processor() method.
 
         """
-
-        return exclusions.open()
+        # works stable only on Community driver
+        return self.community_driver
 
     @property
     def datetime(self):

{sqlalchemy_iris-0.17.1b3.dist-info → sqlalchemy_iris-0.17.1b4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sqlalchemy-iris
-Version: 0.17.1b3
+Version: 0.17.1b4
 Summary: InterSystems IRIS for SQLAlchemy
 Home-page: https://github.com/caretdev/sqlalchemy-iris
 Maintainer: CaretDev

{sqlalchemy_iris-0.17.1b3.dist-info → sqlalchemy_iris-0.17.1b4.dist-info}/RECORD

@@ -65,20 +65,19 @@ irisnative/_IRISNative.py,sha256=HQ4nBhc8t8_5OtxdMG-kx1aa-T1znf2I8obZOPLOPzg,665
 irisnative/__init__.py,sha256=6YmvBLQSURsCPKaNg7LK-xpo4ipDjrlhKuwdfdNb3Kg,341
 sqlalchemy_iris/__init__.py,sha256=79niafYbL1XOw3eJfu0KwrHfP8CIb2I4HdN4B9PI_sQ,1297
 sqlalchemy_iris/alembic.py,sha256=L58qBIj6HwLmtU6FS5RXKW0gHr1mNTrBSChEllSh1n0,6607
-sqlalchemy_iris/base.py,sha256=nvGT7Fu8PogLItm0CwM9Mkmxp2_GzogHw7W1KUSKAMM,54562
+sqlalchemy_iris/base.py,sha256=c9YpMQMFa6bgWg_z5BS3NskboYdKto9by0FeAe8qVWE,54469
 sqlalchemy_iris/embedded.py,sha256=5WZ78PIYB_pPyaLrK4E7kHUsGBRiwzYHjsTDiNYHUGg,819
 sqlalchemy_iris/information_schema.py,sha256=FUL3z_viGjjOvDA71Mbk5k94dUGcLV4dW1xHxBgM1rk,6188
 sqlalchemy_iris/iris.py,sha256=Of0Ruc9W2c5ll5sjAy1xRo4tf1m0l_ab0vAdacTv3Yw,276
 sqlalchemy_iris/irisasync.py,sha256=7Kmso-RGjxQi9Y4x-zQaUk1ylDQ7TDvpvlZh_syJtGw,312
 sqlalchemy_iris/provision.py,sha256=drorbIgNO770Ws0XiCRXY_sDbQGIy2_zzNK3KYrDetY,198
-sqlalchemy_iris/requirements.py,sha256=Xxk8eGmXHUQoz3a8Hg8UxebJ-bdJYhCazrcaJTgWzOE,44393
+sqlalchemy_iris/requirements.py,sha256=9Klyec0qS2MHEaXbONauP7FUF5bi__vfsBrwOEKKTYg,44444
 sqlalchemy_iris/types.py,sha256=M5uyeANVN6MU40kiWBePGTCnVaAAKmfLOHq7zuJ0z6A,12024
-sqlalchemy_iris/intersystems/__init__.py,sha256=LFMRKPMTEFSbnlIUyXLQuz6E5X1UAFJf107I_VEw6-Y,5506
-sqlalchemy_iris/intersystems/cursor.py,sha256=I6hICJqlpomXpvE3fx0JWQwTlD6-GQi9cHxa4PAzGZM,464
+sqlalchemy_iris/intersystems/__init__.py,sha256=J1WcKKAfEASHTmxCav_sGQeb2GE-FXgrgWnUDY8zMag,5463
 sqlalchemy_iris/intersystems/dbapi.py,sha256=JOPjpXrD_cwCzAwnO9cRwBtv2SM8YbczOk8PFX3oM_4,899
-sqlalchemy_iris-0.17.1b3.dist-info/LICENSE,sha256=RQmigqltsLq8lfOBc_KwtL0gkODyUCNpU-0ZiZwGlho,1075
-sqlalchemy_iris-0.17.1b3.dist-info/METADATA,sha256=gHWh-UOSV6T-3bUUHoNjUabiVQJqWbt4JT6e6WOJzmc,2946
-sqlalchemy_iris-0.17.1b3.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-sqlalchemy_iris-0.17.1b3.dist-info/entry_points.txt,sha256=sYU1YvyyeGqOVVMpHySThfEhrVQL1lUVz5rDwmwCj7E,258
-sqlalchemy_iris-0.17.1b3.dist-info/top_level.txt,sha256=QRY18YUXUJrRde4aayj_brj0lr2LBRVZS1ZoVoDFVS0,45
-sqlalchemy_iris-0.17.1b3.dist-info/RECORD,,
+sqlalchemy_iris-0.17.1b4.dist-info/LICENSE,sha256=RQmigqltsLq8lfOBc_KwtL0gkODyUCNpU-0ZiZwGlho,1075
+sqlalchemy_iris-0.17.1b4.dist-info/METADATA,sha256=B0C1zKjsivRVcY7SyfEfX0D4BgcOqJuWcfimn4g9dwk,2946
+sqlalchemy_iris-0.17.1b4.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+sqlalchemy_iris-0.17.1b4.dist-info/entry_points.txt,sha256=sYU1YvyyeGqOVVMpHySThfEhrVQL1lUVz5rDwmwCj7E,258
+sqlalchemy_iris-0.17.1b4.dist-info/top_level.txt,sha256=QRY18YUXUJrRde4aayj_brj0lr2LBRVZS1ZoVoDFVS0,45
+sqlalchemy_iris-0.17.1b4.dist-info/RECORD,,

sqlalchemy_iris/intersystems/cursor.py

@@ -1,17 +0,0 @@
-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
-