sqlalchemy-iris 0.10.0b2__py3-none-any.whl → 0.10.1__py3-none-any.whl

intersystems_iris/dbapi/_Parameter.py

@@ -84,8 +84,14 @@ class _Parameter(intersystems_iris.dbapi._Descriptor._Descriptor):
             float: lambda v : v,
             decimal.Decimal: lambda v : v,
         }
-        func = _set_switcher[type(self.__value)] if type(self.__value) in _set_switcher else (lambda v : str(v))
-        value = func(self.__value)
+        func = None
+        if issubclass(type(self.__value), enum.Enum):
+            value = self.__value.value
+        elif type(self.__value) in _set_switcher:
+            func = _set_switcher[type(self.__value)]
+            value = func(self.__value)
+        else:
+            value = str(self.__value)
         if self.mode == ParameterMode.REPLACED_LITERAL:
             if isinstance(value, str) and value.isdigit():
                 value = int(value)

intersystems_iris/dbapi/_ResultSetRow.py

@@ -88,7 +88,7 @@ class _ResultSetRow:
             SQLType.TYPE_DATE: None,
             SQLType.TYPE_TIME: None,
             SQLType.TYPE_TIMESTAMP: None,
-            SQLType.VARBINARY: None,
+            SQLType.VARBINARY: bytes,
             SQLType.VARCHAR: str,
             SQLType.WCHAR: None,
             SQLType.WLONGVARCHAR: None,
@@ -165,6 +165,8 @@ class _ResultSetRow:
                         pass
                     elif item is None:
                         pass
+                    elif value_type is bytes:
+                        item = bytes(map(ord, item))
                     elif issubclass(value_type, IRISStream):
                         stream = value_type(self._connection, item)
                         item = stream.fetch()

sqlalchemy_iris/alembic.py

@@ -1,25 +1,39 @@
 import logging
+import re
 
 from typing import Optional
+from typing import Any
 
 from sqlalchemy.ext.compiler import compiles
 from sqlalchemy.sql.base import Executable
 from sqlalchemy.sql.elements import ClauseElement
+from sqlalchemy.sql.type_api import TypeEngine
+from sqlalchemy.sql import table
+from sqlalchemy import types
 
 from alembic.ddl import DefaultImpl
 from alembic.ddl.base import ColumnNullable
 from alembic.ddl.base import ColumnType
 from alembic.ddl.base import ColumnName
+from alembic.ddl.base import AddColumn
+from alembic.ddl.base import DropColumn
 from alembic.ddl.base import Column
 from alembic.ddl.base import alter_table
 from alembic.ddl.base import alter_column
+from alembic.ddl.base import drop_column
 from alembic.ddl.base import format_type
 from alembic.ddl.base import format_column_name
-
 from .base import IRISDDLCompiler
 
 log = logging.getLogger(__name__)
 
+# IRIS Interprets these types as %Streams, and no direct type change is available
+_as_stream = [
+    types.LargeBinary,
+    types.BLOB,
+    types.CLOB,
+]
+
 
 class IRISImpl(DefaultImpl):
     __dialect__ = "iris"
@@ -54,28 +68,71 @@ class IRISImpl(DefaultImpl):
         ):
             return False
 
-        return super().compare_server_default(
-            inspector_column,
-            metadata_column,
-            rendered_metadata_default,
-            rendered_inspector_default,
-        )
+        if rendered_metadata_default is not None:
+            rendered_metadata_default = re.sub(
+                r"[\(\) \"\']", "", rendered_metadata_default
+            )
+
+        if rendered_inspector_default is not None:
+            rendered_inspector_default = re.sub(
+                r"[\(\) \"\']", "", rendered_inspector_default
+            )
+
+        return rendered_inspector_default != rendered_metadata_default
 
-    def drop_column(
+    def alter_column(
         self,
         table_name: str,
-        column: Column,
+        column_name: str,
+        type_: Optional[TypeEngine] = None,
+        existing_type: Optional[TypeEngine] = None,
         schema: Optional[str] = None,
-        **kw,
+        name: Optional[str] = None,
+        **kw: Any,
     ) -> None:
-        column_name = column.name
-        fkeys = self.dialect.get_foreign_keys(self.connection, table_name, schema)
-        fkey = [
-            fkey["name"] for fkey in fkeys if column_name in fkey["constrained_columns"]
-        ]
-        if len(fkey) == 1:
-            self._exec(_ExecDropForeignKey(table_name, fkey[0], schema))
-        super().drop_column(table_name, column, schema, **kw)
+        if existing_type.__class__ not in _as_stream and type_.__class__ in _as_stream:
+            """
+            To change column type to %Stream
+            * rename the column with a new name with suffix `__superset_tmp`
+            * create a new column with the old name
+            * copy data from an old column to new column
+            * drop old column
+            * fix missing parameters, such as nullable
+            """
+            tmp_column = f"{column_name}__superset_tmp"
+            self._exec(ColumnName(table_name, column_name, tmp_column, schema=schema))
+            new_kw = {}
+            self._exec(
+                AddColumn(
+                    table_name,
+                    Column(column_name, type_=type_, **new_kw),
+                    schema=schema,
+                )
+            )
+            tab = table(
+                table_name,
+                Column(column_name, key="new_col"),
+                Column(tmp_column, key="old_col"),
+                schema=schema,
+            )
+            self._exec(tab.update().values({tab.c.new_col: tab.c.old_col}))
+            self._exec(DropColumn(table_name, Column(tmp_column), schema=schema))
+            new_kw = {}
+            for k in ["server_default", "nullable", "autoincrement"]:
+                if f"existing_{k}" in kw:
+                    new_kw[k] = kw[f"existing_{k}"]
+            return super().alter_column(
+                table_name, column_name, schema=schema, name=name, **new_kw
+            )
+        return super().alter_column(
+            table_name,
+            column_name,
+            type_=type_,
+            existing_type=existing_type,
+            schema=schema,
+            name=name,
+            **kw,
+        )
 
 
 class _ExecDropForeignKey(Executable, ClauseElement):
@@ -126,3 +183,11 @@ def visit_rename_column(element: ColumnName, compiler: IRISDDLCompiler, **kw) ->
         alter_column(compiler, element.column_name),
         format_column_name(compiler, element.newname),
     )
+
+
+@compiles(DropColumn, "iris")
+def visit_drop_column(element: DropColumn, compiler: IRISDDLCompiler, **kw) -> str:
+    return "%s %s CASCADE" % (
+        alter_table(compiler, element.table_name, element.schema),
+        drop_column(compiler, element.column.name, **kw),
+    )

sqlalchemy_iris/base.py

@@ -10,6 +10,7 @@ from sqlalchemy.sql import util as sql_util
 from sqlalchemy.sql import between
 from sqlalchemy.sql import func
 from sqlalchemy.sql.functions import ReturnTypeFromArgs
+from sqlalchemy.sql.elements import Null
 from sqlalchemy.sql import expression
 from sqlalchemy.sql import schema
 from sqlalchemy import sql, text
@@ -394,6 +395,12 @@ RESERVED_WORDS = set(
 class IRISCompiler(sql.compiler.SQLCompiler):
     """IRIS specific idiosyncrasies"""
 
+    def visit_exists_unary_operator(self, element, operator, within_columns_clause=False, **kw):
+        if within_columns_clause:
+            return "(SELECT 1 WHERE EXISTS(%s))" % self.process(element.element, **kw)
+        else:
+            return "EXISTS(%s)" % self.process(element.element, **kw)
+
     def limit_clause(self, select, **kw):
         return ""
 
@@ -439,6 +446,22 @@ class IRISCompiler(sql.compiler.SQLCompiler):
     def visit_is_false_unary_operator(self, element, operator, **kw):
         return "%s = 0" % self.process(element.element, **kw)
 
+    def visit_is__binary(self, binary, operator, **kw):
+        op = "IS" if isinstance(binary.right, Null) else "="
+        return "%s %s %s" % (
+            self.process(binary.left),
+            op,
+            self.process(binary.right),
+        )
+
+    def visit_is_not_binary(self, binary, operator, **kw):
+        op = "IS NOT" if isinstance(binary.right, Null) else "<>"
+        return "%s %s %s" % (
+            self.process(binary.left),
+            op,
+            self.process(binary.right),
+        )
+
     def get_select_precolumns(self, select, **kw):
         text = ""
         if select._distinct or select._distinct_on:
@@ -556,16 +579,6 @@ class IRISCompiler(sql.compiler.SQLCompiler):
         else:
             return ""
 
-    def visit_column(self, column, within_columns_clause=False, **kwargs):
-        text = super().visit_column(
-            column, within_columns_clause=within_columns_clause, **kwargs
-        )
-        if within_columns_clause:
-            return text
-        # if isinstance(column.type, sqltypes.Text):
-        #     text = "CONVERT(VARCHAR, %s)" % (text,)
-        return text
-
     def visit_concat_op_binary(self, binary, operator, **kw):
         return "STRING(%s, %s)" % (
             self.process(binary.left, **kw),
@@ -821,6 +834,8 @@ class IRISDialect(default.DefaultDialect):
 
     supports_sequences = False
 
+    returns_native_bytes = True
+
     div_is_floordiv = False
 
     postfetch_lastrowid = True

{sqlalchemy_iris-0.10.0b2.dist-info → sqlalchemy_iris-0.10.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlalchemy-iris
-Version: 0.10.0b2
+Version: 0.10.1
 Summary: InterSystems IRIS for SQLAlchemy
 Home-page: https://github.com/caretdev/sqlalchemy-iris
 Maintainer: CaretDev

{sqlalchemy_iris-0.10.0b2.dist-info → sqlalchemy_iris-0.10.1.dist-info}/RECORD

@@ -33,13 +33,13 @@ intersystems_iris/_SharedMemorySocket.py,sha256=2iUaS1FdJNSCUEaE-VT0O_dxF6NRwqZS
 intersystems_iris/__init__.py,sha256=Tk1tD28LwvF6X3yXQsJFLE1Bc-PR3gUJWcX5UnNYOdY,1773
 intersystems_iris/__main__.py,sha256=rCtINTfJcADMAsw1ja-MEO7Q-XekrWthYowzWV8xGIQ,218
 intersystems_iris/dbapi/_Column.py,sha256=VCLHLXs3wuGcUa9w_qy7HBFsuGvhmmI3kGYBagQg59U,2535
-intersystems_iris/dbapi/_DBAPI.py,sha256=BOyWi5EiXL1DmgqDfzM9df-tE5sTkqSw4tuFEpk89kg,95597
+intersystems_iris/dbapi/_DBAPI.py,sha256=2kjZM_fYwuQGRJX1stqOuAGgvOq5Q0F5zzZtrboC-do,98080
 intersystems_iris/dbapi/_Descriptor.py,sha256=IjyITxvjygDrhpk-0lGhdqQPh91SG6nTb1vi-AqyJNI,1391
 intersystems_iris/dbapi/_IRISStream.py,sha256=Vz3ydS9djxqqp-1F385FHgjjJNosXNpGMu-rkAPJDrs,2113
 intersystems_iris/dbapi/_Message.py,sha256=jpLG3HZElqp981iNPFW8UNRO3NbHf6poEv6yywX0Ssw,4076
-intersystems_iris/dbapi/_Parameter.py,sha256=JqpWCpz_XhLBWpxGYJ6UqE0zdysDO4LxoV7zgdaiXEA,4687
+intersystems_iris/dbapi/_Parameter.py,sha256=EUZhS8qnNqgiOfuayE6LcpN8lBujk0_ZChGkC-v3pXY,4846
 intersystems_iris/dbapi/_ParameterCollection.py,sha256=ta8nuwHjTbY4V_ouOmNQv4C46u8eA6cdvij9xIWqQuo,5151
-intersystems_iris/dbapi/_ResultSetRow.py,sha256=o_lqYAmge8V9KjIWjiWKHUe8ZshgKypFJT6OLIQEjAo,12810
+intersystems_iris/dbapi/_ResultSetRow.py,sha256=tNKCv5P8XhP9zzdPpBGiXYHLKOScITTBGSqtui1TAM0,12910
 intersystems_iris/dbapi/_SQLType.py,sha256=IlDacXwQzUMWaJ02Zsu2bUfvUC3-5mBx-m6mE0Yp7ts,557
 intersystems_iris/dbapi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 intersystems_iris/dbapi/preparser/_PreParser.py,sha256=024w-s3n_JNsk_ISC8avJMK3QEZE3hSuD0Nr8arJdZw,78828
@@ -68,17 +68,17 @@ iris/irisloader.py,sha256=2ZLM0FlYNStTiZrXuvDcO-V_XZVgmB3R8vesmaqMqYA,4808
 irisnative/_IRISNative.py,sha256=HQ4nBhc8t8_5OtxdMG-kx1aa-T1znf2I8obZOPLOPzg,665
 irisnative/__init__.py,sha256=6YmvBLQSURsCPKaNg7LK-xpo4ipDjrlhKuwdfdNb3Kg,341
 sqlalchemy_iris/__init__.py,sha256=TKZt8fTcW8HDhw5ukl6sPyodH8u185eWYrKPHrJGb3I,992
-sqlalchemy_iris/alembic.py,sha256=inxt57Ei0XAmu4p2acRsz4e6HLlJjVJCIcltfh4WTDs,3980
-sqlalchemy_iris/base.py,sha256=Qi5VeYLXqJswOoJWTEK0KTqsJygfodj-QjNVVQuPCng,49415
+sqlalchemy_iris/alembic.py,sha256=IhZP6P-whMrXzD8lTCKvIC6EK8hKW88JTNG_U8t2quk,6373
+sqlalchemy_iris/base.py,sha256=8vMpwjF9bDVFT5t1k6G5ZUvAZEf6bfs8pYUmrov9rzM,49924
 sqlalchemy_iris/embedded.py,sha256=6DbnfcJwYQmHjyvQQ0cN6mV6zbF3AAOJkucww5LypiE,547
 sqlalchemy_iris/information_schema.py,sha256=Ei1gAHXn4fWpvmUzwf-2hGslU458uQXFt1s0r1NAj2Y,6132
 sqlalchemy_iris/iris.py,sha256=Of0Ruc9W2c5ll5sjAy1xRo4tf1m0l_ab0vAdacTv3Yw,276
 sqlalchemy_iris/provision.py,sha256=drorbIgNO770Ws0XiCRXY_sDbQGIy2_zzNK3KYrDetY,198
 sqlalchemy_iris/requirements.py,sha256=eIV8bcPHOmSrGxzxfqVeLYEdol3MIoXnRQLI9sq32mM,7175
 sqlalchemy_iris/types.py,sha256=JRQROZyhAuVX0w_hYkuRfJQt9Bxa4ruKfVQrG_s-0Qc,4216
-sqlalchemy_iris-0.10.0b2.dist-info/LICENSE,sha256=RQmigqltsLq8lfOBc_KwtL0gkODyUCNpU-0ZiZwGlho,1075
-sqlalchemy_iris-0.10.0b2.dist-info/METADATA,sha256=qTGQvDamUBWlLtu-iVnsXBHlndo03lvLdLaZmXSBIi8,2341
-sqlalchemy_iris-0.10.0b2.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-sqlalchemy_iris-0.10.0b2.dist-info/entry_points.txt,sha256=w7qS4R3anhoVEC5rzpw1H6gLu41wdZiahfg9bNH0Tio,119
-sqlalchemy_iris-0.10.0b2.dist-info/top_level.txt,sha256=mjpHqFjekbB1TWr3xI3o4AqN3Spby-_uqyuSSeBDmuw,50
-sqlalchemy_iris-0.10.0b2.dist-info/RECORD,,
+sqlalchemy_iris-0.10.1.dist-info/LICENSE,sha256=RQmigqltsLq8lfOBc_KwtL0gkODyUCNpU-0ZiZwGlho,1075
+sqlalchemy_iris-0.10.1.dist-info/METADATA,sha256=GwyPdB22ABXENbkyfYOQq-AIKHuv7ZdYYmw4pmGbQB0,2339
+sqlalchemy_iris-0.10.1.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+sqlalchemy_iris-0.10.1.dist-info/entry_points.txt,sha256=w7qS4R3anhoVEC5rzpw1H6gLu41wdZiahfg9bNH0Tio,119
+sqlalchemy_iris-0.10.1.dist-info/top_level.txt,sha256=mjpHqFjekbB1TWr3xI3o4AqN3Spby-_uqyuSSeBDmuw,50
+sqlalchemy_iris-0.10.1.dist-info/RECORD,,