some more fixes for official driver

Author: daimor

sqlalchemy_iris/base.py

@@ -1091,10 +1091,7 @@ def do_execute(self, cursor, query, params, context=None):
         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,22 +19,34 @@ def wrapper(cursor, *args, **kwargs):
             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)
                 if not sqlcode:
                     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()
 
@@ -123,9 +135,13 @@ def on_connect(conn):
             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
 

sqlalchemy_iris/intersystems/cursor.py

@@ -960,8 +960,8 @@ def datetime_literals(self):
         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/requirements.py

@@ -93,14 +93,18 @@ def define_tables(cls, metadata):
         @classmethod
         def insert_data(cls, connection):
             connection.execute(
-                text(
-                    """
-                    insert into tab (col) values
-                        ('some data 1'),
-                        ('some data 2'),
-                        ('some data 3')
-                """
-                )
+                cls.tables.tab.insert(),
+                [
+                    {
+                        "col": "some data 1",
+                    },
+                    {
+                        "col": "some data 2",
+                    },
+                    {
+                        "col": "some data 3",
+                    },
+                ],
             )
 
         def test_str_to_blob(self, connection, ops_context):

tests/test_alembic.py

@@ -22,7 +22,6 @@
 from sqlalchemy_iris import IRISListBuild
 from sqlalchemy_iris import IRISVector
 from sqlalchemy.exc import DatabaseError
-from sqlalchemy.testing.config import requirements
 
 import pytest