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

{sqlalchemy_iris-0.16.0/sqlalchemy_iris.egg-info → sqlalchemy_iris-0.16.1b1}/PKG-INFO

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

{sqlalchemy_iris-0.16.0 → sqlalchemy_iris-0.16.1b1}/intersystems_iris/dbapi/_DBAPI.py

@@ -2427,7 +2427,6 @@ class EmbdeddedCursor(_BaseCursor):
         sqlcode = 0
         message = None
         try:
-            print("!!!! _send_direct_query_request:params", [statement, params])
             self._result_set = self._sql.exec(statement, *params)
             self._rowcount = self._result_set.ResultSet._ROWCOUNT
             self._get_column_info()

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

@@ -1,6 +1,6 @@
 [metadata]
 name = sqlalchemy-iris
-version = 0.16.0
+version = 0.16.1b1
 description = InterSystems IRIS for SQLAlchemy
 long_description = file: README.md
 url = https://github.com/caretdev/sqlalchemy-iris

{sqlalchemy_iris-0.16.0 → sqlalchemy_iris-0.16.1b1}/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 @@ class IRISDialect(default.DefaultDialect):
                 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 @@ There are no access to %Dictionary, may be required for some advanced features,
     _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 @@ There are no access to %Dictionary, may be required for some advanced features,
             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 @@ There are no access to %Dictionary, may be required for some advanced features,
                 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-0.16.0 → sqlalchemy_iris-0.16.1b1}/sqlalchemy_iris/requirements.py

@@ -15,6 +15,7 @@ from sqlalchemy.testing import exclusions
 
 
 class Requirements(SuiteRequirements, AlembicRequirements):
+
     @property
     def array_type(self):
         return exclusions.closed()
@@ -68,11 +69,10 @@ class Requirements(SuiteRequirements, AlembicRequirements):
 
     @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 @@ class Requirements(SuiteRequirements, AlembicRequirements):
     @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):

{sqlalchemy_iris-0.16.0 → sqlalchemy_iris-0.16.1b1/sqlalchemy_iris.egg-info}/PKG-INFO

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