more fixes

Author: daimor

django_iris/base.py

@@ -38,7 +38,7 @@ class DatabaseClient(BaseDatabaseClient):
 
 
 class DatabaseWrapper(BaseDatabaseWrapper):
-    vendor = 'interystems'
+    vendor = 'intersystems'
     display_name = 'InterSystems IRIS'
 
     data_types = {
@@ -75,19 +75,19 @@ class DatabaseWrapper(BaseDatabaseWrapper):
 
     operators = {
         'exact': '= %s',
-        # 'iexact': "LIKE %s ESCAPE '\\'",
-        # 'contains': "LIKE %s ESCAPE '\\'",
-        # 'icontains': "LIKE %s ESCAPE '\\'",
+        'iexact': "LIKE %s ESCAPE '\\'",
+        'contains': "LIKE %s ESCAPE '\\'",
+        'icontains': "LIKE %s ESCAPE '\\'",
         # 'regex': 'REGEXP %s',
         # 'iregex': "REGEXP '(?i)' || %s",
         'gt': '> %s',
         'gte': '>= %s',
         'lt': '< %s',
         'lte': '<= %s',
         'startswith': "%STARTSWITH %s",
-        # 'endswith': "LIKE %s ESCAPE '\\'",
+        'endswith': "LIKE %s ESCAPE '\\'",
         'istartswith': "%STARTSWITH %s",
-        # 'iendswith': "LIKE %s ESCAPE '\\'",
+        'iendswith': "LIKE %s ESCAPE '\\'",
 
     }
     Database = Database
@@ -165,7 +165,9 @@ def get_new_connection(self, conn_params):
         return Database.connect(**conn_params)
 
     def init_connection_state(self):
-        pass
+        cursor = self.connection.cursor()
+        # cursor.callproc('%SYSTEM_SQL.Util_SetOption', ['SELECTMODE', 1])
+        # cursor.callproc('%SYSTEM.SQL_SetSelectMode', [1])
 
     @async_unsafe
     def create_cursor(self, name=None):

django_iris/cursor.py

@@ -20,6 +20,7 @@ def _fix_for_params(self, query, params):
     def execute(self, query, params=None):
         self.times = 0
         query, params = self._fix_for_params(query, params)
+        # print(query, params)
         return self.cursor.execute(query, params)
 
     def executemany(self, query, params=None):

django_iris/features.py

@@ -15,3 +15,5 @@ class DatabaseFeatures(BaseDatabaseFeatures):
     supports_column_check_constraints = False
     supports_table_check_constraints = False
     can_introspect_check_constraints = False
+
+    interprets_empty_strings_as_nulls = True

django_iris/operations.py

@@ -1,32 +1,18 @@
+import imp
 from django.conf import settings
 from django.db.backends.base.operations import BaseDatabaseOperations
 from django.utils import timezone
 from itertools import chain
+from datetime import datetime
 
+import traceback
 
 class DatabaseOperations(BaseDatabaseOperations):
     def quote_name(self, name):
         if name.startswith('"') and name.endswith('"'):
             return name  # Quoting once is enough.
         return '"%s"' % name
 
-    def adapt_datetimefield_value(self, value):
-        if value is None:
-            return None
-
-        # Expression values are adapted by the database.
-        if hasattr(value, 'resolve_expression'):
-            return value
-
-        # MySQL doesn't support tz-aware datetimes
-        if timezone.is_aware(value):
-            if settings.USE_TZ:
-                value = timezone.make_naive(value, self.connection.timezone)
-            else:
-                raise ValueError(
-                    "IRIS backend does not support timezone-aware datetimes when USE_TZ is False.")
-        return str(value).split("+")[0]
-
     def last_insert_id(self, cursor, table_name, pk_name):
         cursor.execute("SELECT TOP 1 %(pk)s FROM %(table)s ORDER BY %(pk)s DESC" % {
             'table': table_name,
@@ -60,3 +46,39 @@ def limit_offset_sql(self, low_mark, high_mark):
             # ('LIMIT %d' % limit) if limit else None,
             # ('OFFSET %d' % offset) if offset else None,
         ) if sql)
+
+    def adapt_datetimefield_value(self, value):
+        # print('adapt_datetimefield_value', value)
+        # print(*traceback.format_stack(), sep='\n')
+        if value is None:
+            return None
+        # Expression values are adapted by the database.
+        if hasattr(value, 'resolve_expression'):
+            return value
+
+        value = int(value.timestamp() * 1000000)
+        if value >= 0:
+            value += 2 ** 60
+        else:
+            value += -(2 ** 61 * 3)
+        
+        return str(value)
+        # return str(value).split("+")[0]
+
+    def get_db_converters(self, expression):
+        converters = super().get_db_converters(expression)
+        internal_type = expression.output_field.get_internal_type()
+        if internal_type == "DateTimeField":
+            converters.append(self.convert_datetimefield_value)
+        return converters
+
+    def convert_datetimefield_value(self, value, expression, connection):
+        # print('convert_datetimefield_value', value, expression)
+        if isinstance(value, int):
+            if value > 0:
+                value -= 2 ** 60
+            else:
+                value -= -(2 ** 61 * 3)
+            value = value / 1000000
+            value = datetime.fromtimestamp(value)
+        return value