sqlalchemy-iris 0.15.1__tar.gz → 0.15.2__tar.gz

{sqlalchemy_iris-0.15.1/sqlalchemy_iris.egg-info → sqlalchemy_iris-0.15.2}/PKG-INFO

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

{sqlalchemy_iris-0.15.1 → sqlalchemy_iris-0.15.2}/intersystems_iris/_ConnectionInformation.py

@@ -1,7 +1,7 @@
 import intersystems_iris._Constant
 
-class _ConnectionInformation(object):
 
+class _ConnectionInformation(object):
     def __init__(self):
         self.protocol_version = intersystems_iris._Constant._Constant.PROTOCOL_VERSION
         self._is_unicode = True
@@ -20,9 +20,10 @@ class _ConnectionInformation(object):
     def _parse_server_version(self, server_version):
         split_1 = server_version.split("|")
         self._server_version = split_1[0]
-        if len(split_1)>1: self._iris_install_dir = split_1[1]
+        if len(split_1) > 1:
+            self._iris_install_dir = split_1[1]
         if self._server_version.find("Version") > 0:
-            version = server_version[server_version.find("Version")+8:]
+            version = server_version[server_version.find("Version") + 8 :]
             self._server_version_major = version.split(".")[0]
             self._server_version_minor = version.split(".")[1]
         return
@@ -31,24 +32,25 @@ class _ConnectionInformation(object):
     def _map_server_locale(locale):
         # we need to map IRIS locale literals to Python locale literals
         _locales = {
-            "LATIN1": "latin_1", 
-            "LATIN2": "iso8859_2", 
-            "LATINC": "iso8859_5", 
-            "LATINA": "iso8859_6", 
-            "LATING": "iso8859_7", 
-            "LATINH": "iso8859_8", 
-            "LATINT": "iso8859_11", 
-            "LATIN9": "iso8859_15", 
-            "CP1250": "cp1250", 
-            "CP1251": "cp1251", 
-            "CP1252": "cp1252", 
-            "CP1253": "cp1253", 
-            "CP1255": "cp1255", 
-            "CP1256": "cp1256", 
-            "CP1257": "cp1257", 
-            "CP874": "cp874", 
+            "LATIN1": "latin_1",
+            "LATIN2": "iso8859_2",
+            "LATINC": "iso8859_5",
+            "LATINA": "iso8859_6",
+            "LATING": "iso8859_7",
+            "LATINH": "iso8859_8",
+            "LATINT": "iso8859_11",
+            "LATIN9": "iso8859_15",
+            "CP1250": "cp1250",
+            "CP1251": "cp1251",
+            "CP1252": "cp1252",
+            "CP1253": "cp1253",
+            "CP1255": "cp1255",
+            "CP1256": "cp1256",
+            "CP1257": "cp1257",
+            "CP874": "cp874",
             "UNICODE": "utf-8",
         }
         return _locales[locale.upper()] if locale.upper() in _locales else locale
 
-
+    def __repr__(self) -> str:
+        return f"<{self._server_version}>"

{sqlalchemy_iris-0.15.1 → sqlalchemy_iris-0.15.2}/intersystems_iris/dbapi/_DBAPI.py

@@ -25,6 +25,7 @@ from ._SQLType import SQLType
 
 from .._IRISNative import connect as native_connect
 from .._IRISEmbedded import _IRISEmbedded
+from intersystems_iris._IRISConnection import _IRISConnection
 
 
 def NotImplementedErrorDBAPI(msg=None):
@@ -42,7 +43,7 @@ def embedded_connect(*args, hostname=None, port=None, namespace=None, username=N
     return connection
 
 
-def connect(*args, embedded=False, hostname=None, port=None, namespace=None, username=None, password=None, **kw):
+def connect(*args, embedded=False, hostname=None, port=None, namespace=None, username=None, password=None, **kw) -> _IRISConnection | _IRISEmbedded:
     try:
         if not embedded:
             return native_connect(
@@ -2149,6 +2150,7 @@ class Cursor(_BaseCursor):
 
         if retval is None:
             return retval
+        # print('retval', retval[:])
         return retval.as_tuple()
         # return tuple(retval[:])
 

{sqlalchemy_iris-0.15.1 → sqlalchemy_iris-0.15.2}/intersystems_iris/dbapi/_ResultSetRow.py

@@ -1,5 +1,5 @@
 import uuid
-from datetime import datetime, date, time
+from datetime import datetime, date, time, timezone
 from collections import namedtuple
 from ._SQLType import SQLType
 from .._DBList import _DBList
@@ -11,20 +11,26 @@ from ._Column import _Column
 def from_timestamp_posix(posix):
     time = int(posix)
     if time > 0:
-        time ^= 0x1000000000000000 
+        time ^= 0x1000000000000000
     else:
-        time |= 0xF000000000000000 
+        time |= 0xF000000000000000
 
     time /= 1000000
 
-    value = datetime.utcfromtimestamp(time).replace(tzinfo=None)
+    value = datetime.fromtimestamp(time, timezone.utc).replace(tzinfo=None)
     return value
 
+
 class _ResultSetRow:
     _locale = "latin-1"
     _connection = None
 
-    def __init__(self, connection, columns=None, rowcount=0, ):
+    def __init__(
+        self,
+        connection,
+        columns=None,
+        rowcount=0,
+    ):
         self._connection = connection
         # index from user-inputted columns to columns received from server
         self.col_index = []
@@ -55,7 +61,7 @@ class _ResultSetRow:
             self.colCount = len(columns) if columns != None else 0
 
         # number of columns received from server, aka number of items per row
-        #self.colCount = rowcount
+        # self.colCount = rowcount
 
         # list of _ListItems corresponding to the various entries in the row, plus the offset of next row's first _ListItem
         self.rowItems = None
@@ -126,9 +132,9 @@ class _ResultSetRow:
 
         def get(self):
             return self[:]
-        
+
         def as_tuple(self):
-            row = namedtuple('Row', [col.name for col in self._columns], rename=True)
+            row = namedtuple("Row", [col.name for col in self._columns], rename=True)
             values = self[:]
             return row(*values)
 
@@ -164,15 +170,18 @@ class _ResultSetRow:
                         HOROLOG_ORDINAL = date(1840, 12, 31).toordinal()
                         if item:
                             item = date.fromordinal(HOROLOG_ORDINAL + item)
+                    if ctype == SQLType.TIMESTAMP and item:
+                        item = item + '.000' if '.' not in item else item
+                        item = datetime.strptime(item, '%Y-%m-%d %H:%M:%S.%f')
                     if ctype == SQLType.TIME_HOROLOG:
                         if item:
                             item = time(item // 3600, item % 3600 // 60, item % 3600 % 60)
                     if ctype == SQLType.GUID:
                         item = uuid.UUID(item)
-                    if ctype == SQLType.TIMESTAMP_POSIX:
+                    if ctype == SQLType.TIMESTAMP_POSIX and item:
                         item = from_timestamp_posix(item)
 
-                    if _column.tableName == 'None' and _column.schema == 'None':
+                    if _column.tableName == "None" and _column.schema == "None":
                         # Ignore for anonymous tables
                         pass
                     elif item is None:
@@ -285,8 +294,9 @@ class _ResultSetRow:
                 rowItems[i] = curr_offset
                 prev_offset = curr_offset
             except IndexError:
-                raise IndexError("Row incomplete: " + str(self.colCount) +
-                                 " items expected, but " + str(i) + " were found")
+                raise IndexError(
+                    "Row incomplete: " + str(self.colCount) + " items expected, but " + str(i) + " were found"
+                )
         self.update(rowItems)
         return True
 
@@ -319,8 +329,9 @@ class _ResultSetRow:
                 rowItems[i] = curr_offset
                 prev_offset = curr_offset
             except IndexError:
-                raise IndexError("Row incomplete: " + str(self.colCount) +
-                                 " items expected, but " + str(i) + " were found")
+                raise IndexError(
+                    "Row incomplete: " + str(self.colCount) + " items expected, but " + str(i) + " were found"
+                )
         return self.update(rowItems)
 
     def update(self, rowItems):
@@ -330,7 +341,7 @@ class _ResultSetRow:
                 colIndexOffsets[idx] = rowItems[i]
             colIndexOffsets[-1] = self._last_list_item.next_offset
             self.rowItems = colIndexOffsets
-            return self.rowItems[:self.colCount]
+            return self.rowItems[: self.colCount]
         self.rowItems = rowItems
         self._offsets = self.DataRow(self)
         self._new_buffer = False

{sqlalchemy_iris-0.15.1 → sqlalchemy_iris-0.15.2}/setup.cfg

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

{sqlalchemy_iris-0.15.1 → sqlalchemy_iris-0.15.2}/sqlalchemy_iris/base.py

@@ -105,8 +105,8 @@ ischema_names = {
     "LONGVARCHAR": LONGVARCHAR,
     "NUMERIC": NUMERIC,
     "SMALLINT": SMALLINT,
-    "TIME": TIME,
-    "TIMESTAMP": TIMESTAMP,
+    "TIME": IRISTime,
+    "TIMESTAMP": IRISTimeStamp,
     "TINYINT": TINYINT,
     "VARBINARY": VARBINARY,
     "VARCHAR": VARCHAR,
@@ -925,8 +925,8 @@ class IRISDialect(default.DefaultDialect):
                 cursor.execute("%CHECKPRIV SELECT ON %Dictionary.PropertyDefinition")
                 self._dictionary_access = cursor.sqlcode == 0
 
-            if not self.supports_vectors:
-                util.warn("No native support for VECTOR or not activated by license")
+            # if not self.supports_vectors:
+            #     util.warn("No native support for VECTOR or not activated by license")
             if not self._dictionary_access:
                 util.warn(
                     """

{sqlalchemy_iris-0.15.1 → sqlalchemy_iris-0.15.2}/sqlalchemy_iris/types.py

@@ -58,6 +58,8 @@ class IRISDate(sqltypes.Date):
 
 
 class IRISTimeStamp(sqltypes.DateTime):
+    __visit_name__ = "timestamp"
+
     def bind_processor(self, dialect):
         def process(value: datetime.datetime):
             if value is not None:
@@ -84,6 +86,8 @@ class IRISTimeStamp(sqltypes.DateTime):
 
 
 class IRISDateTime(sqltypes.DateTime):
+    __visit_name__ = "datetime"
+
     def bind_processor(self, dialect):
         def process(value):
             if value is not None:
@@ -106,6 +110,8 @@ class IRISDateTime(sqltypes.DateTime):
 
 
 class IRISTime(sqltypes.DateTime):
+    __visit_name__ = "time"
+
     def bind_processor(self, dialect):
         def process(value):
             if value is not None:

{sqlalchemy_iris-0.15.1 → sqlalchemy_iris-0.15.2/sqlalchemy_iris.egg-info}/PKG-INFO

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