updated driver

Author: daimor

requirements-iris.txt

@@ -1 +1 @@
-https://github.com/intersystems-community/intersystems-irispython/releases/download/3.9.1/intersystems_iris-3.9.1-py3-none-any.whl
+https://github.com/intersystems-community/intersystems-irispython/releases/download/3.9.2/intersystems_iris-3.9.2-py3-none-any.whl

sqlalchemy_iris/base.py

@@ -1,6 +1,6 @@
 import re
+from decimal import Decimal
 import intersystems_iris.dbapi._DBAPI as dbapi
-import intersystems_iris._IRISNative as IRISNative
 from . import information_schema as ischema
 from sqlalchemy import exc
 from sqlalchemy.orm import aliased
@@ -888,6 +888,8 @@ class IRISDialect(default.DefaultDialect):
 
     supports_vectors = None
 
+    supports_cte = True
+
     colspecs = colspecs
 
     ischema_names = ischema_names
@@ -949,8 +951,8 @@ def on_connect(conn):
                 self.supports_vectors = False
             self._dictionary_access = False
             with conn.cursor() as cursor:
-                cursor.execute("%CHECKPRIV SELECT ON %Dictionary.PropertyDefinition")
-                self._dictionary_access = cursor.sqlcode == 0
+                res = cursor.execute("%CHECKPRIV SELECT ON %Dictionary.PropertyDefinition")
+                self._dictionary_access = res == 0
 
             # if not self.supports_vectors:
             #     util.warn("No native support for VECTOR or not activated by license")
@@ -1061,14 +1063,14 @@ def create_connect_args(self, url):
     _debug_queries = False
     # _debug_queries = True
 
-    def _debug(self, query, params, many=False):
-        from decimal import Decimal
-
+    def _debug(self, query, params, many=False, wrap=True):
         if not self._debug_queries:
             return
         if many:
+            print("-" * 120)
             for p in params:
-                self._debug(query, p)
+                self._debug(query, p, wrap=False)
+            print("-" * 120)
             return
         for p in params:
             if isinstance(p, Decimal):
@@ -1078,21 +1080,11 @@ def _debug(self, query, params, many=False):
             else:
                 v = "%r" % (p,)
             query = query.replace("?", v, 1)
-        print("--")
+        if wrap:
+            print("-" * 120)
         print(query + ";")
-        print("--")
-
-    def _debug_pre(self, query, params, many=False):
-        print("-- do_execute" + "many" if many else "")
-        if not self._debug_queries:
-            return
-        for line in query.split("\n"):
-            print("-- ", line)
-        if many:
-            print(params)
-        else:
-            for p in params:
-                print("-- @param = %r" % (p,))
+        if wrap:
+            print("-" * 120)
 
     def do_execute(self, cursor, query, params, context=None):
         if query.endswith(";"):
@@ -1746,8 +1738,10 @@ def get_multi_columns(
                 coltype = coltype(**kwargs)
 
             default = "" if default == "$c(0)" else default
-            if default and default.startswith('"'):
-                default = "'%s'" % (default[1:-1].replace("'", "''"),)
+            if default:
+                default = str(default)
+                if default.startswith('"'):
+                    default = "'%s'" % (default[1:-1].replace("'", "''"),)
 
             cdict = {
                 "name": name,

sqlalchemy_iris/requirements.py

@@ -15,6 +15,7 @@ class AlembicRequirements(BaseRequirements):
 
 
 class Requirements(SuiteRequirements, AlembicRequirements):
+
     @property
     def array_type(self):
         return exclusions.closed()
@@ -68,11 +69,10 @@ def comment_reflection(self):
 
     @property
     def insert_returning(self):
-        return exclusions.open()
-
-    @property
-    def unusual_column_name_characters(self):
-        return exclusions.open()
+        return exclusions.skip_if(
+            lambda config: not config.db.dialect.insert_returning,
+            "driver doesn't support insert returning",
+        )
 
     @property
     def computed_columns(self):
@@ -211,8 +211,10 @@ def memory_process_intensive(self):
     @property
     def ctes(self):
         """Target database supports CTEs"""
-
-        return exclusions.open()
+        return exclusions.skip_if(
+            lambda config: not config.db.dialect.supports_cte,
+            "driver doesn't support CTEs",
+        )
 
     @property
     def ctes_with_update_delete(self):

tests/conftest.py

@@ -1,6 +1,5 @@
 from sqlalchemy.dialects import registry
 import pytest
-import time
 import os
 
 from sqlalchemy.testing.plugin.plugin_base import pre
@@ -12,12 +11,15 @@
 registry.register(
     "iris.irisasync", "sqlalchemy_iris.irisasync", "IRISDialect_irisasync"
 )
+registry.register(
+    "iris.intersystems", "sqlalchemy_iris.intersystems", "IRISDialect_intersystems"
+)
 
 pytest.register_assert_rewrite("sqlalchemy.testing.assertions")
 
 from sqlalchemy.testing.plugin.pytestplugin import *  # noqa
 
-original_pytest_addoption = pytest_addoption
+original_pytest_addoption = pytest_addoption # noqa
 
 
 def pytest_addoption(parser):
@@ -33,6 +35,14 @@ def pytest_addoption(parser):
         help="Docker image with IRIS",
     )
 
+    group.addoption(
+        "--driver",
+        action="store",
+        default=None,
+        type=str,
+        help="Driver",
+    )
+
 
 @pre
 def start_container(opt, file_config):
@@ -47,11 +57,18 @@ def start_container(opt, file_config):
         username="sqlalchemy",
         password="sqlalchemy",
         namespace="TEST",
-        license_key=os.path.expanduser("~/iris.key") if "community" not in opt.container else None,
+        license_key=(
+            os.path.expanduser("~/iris.key")
+            if "community" not in opt.container
+            else None
+        ),
     )
     iris.start()
-    print("dburi:", iris.get_connection_url())
-    opt.dburi = [iris.get_connection_url()]
+    dburi = iris.get_connection_url()
+    if opt.driver:
+        dburi = dburi.replace("iris://", f"iris+{opt.driver}://")
+    print("dburi:", dburi)
+    opt.dburi = [dburi]
 
 
 def pytest_unconfigure(config):