Ticket #7860: fix_supports_usecs.diff

django/db/models/fields/__init__.py

@@ -523 +523 @@
     def get_manipulator_field_objs(self):
         return [oldforms.CommaSeparatedIntegerField]
 
+def fix_supports_usecs(value):
+    if value is not None:
+        # SQLServer will throw a warning if microseconds are given, because it
+        # doesn't support microseconds.
+        if not connection.features.supports_usecs and hasattr(value, 'microsecond'):
+            value = value.replace(microsecond=0)
+    return value
+
 class DateField(Field):
     empty_strings_allowed = False
     def __init__(self, verbose_name=None, name=None, auto_now=False, auto_now_add=False, **kwargs):
@@ -551 +559 @@
 
     def get_db_prep_lookup(self, lookup_type, value):
         if lookup_type in ('range', 'in'):
-            value = [smart_unicode(v) for v in value]
+            value = [smart_unicode(fix_supports_usecs(v)) for v in value]
         elif lookup_type in ('exact', 'gt', 'gte', 'lt', 'lte') and hasattr(value, 'strftime'):
             value = datetime_safe.new_date(value).strftime('%Y-%m-%d')
         else:
-            value = smart_unicode(value)
+            value = smart_unicode(fix_supports_usecs(value))
         return Field.get_db_prep_lookup(self, lookup_type, value)
 
     def pre_save(self, model_instance, add):
@@ -642 +650 @@
 
     def get_db_prep_lookup(self, lookup_type, value):
         if lookup_type in ('range', 'in'):
-            value = [smart_unicode(v) for v in value]
+            value = [smart_unicode(fix_supports_usecs(v)) for v in value]
         else:
-            value = smart_unicode(value)
+            value = smart_unicode(fix_supports_usecs(value))
         return Field.get_db_prep_lookup(self, lookup_type, value)
 
     def get_manipulator_field_objs(self):
@@ -1107 +1115 @@
         else:
             prep = smart_unicode
         if lookup_type in ('range', 'in'):
-            value = [prep(v) for v in value]
+            value = [prep(fix_supports_usecs(v)) for v in value]
         else:
-            value = prep(value)
+            value = prep(fix_supports_usecs(value))
         return Field.get_db_prep_lookup(self, lookup_type, value)
 
     def pre_save(self, model_instance, add):