Ticket #10970: auto_now_patch_1.diff

django/db/models/fields/__init__.py

@@ -646 +646 @@
 
     def pre_save(self, model_instance, add):
         if self.auto_now or (self.auto_now_add and add):
-            value = datetime.datetime.now()
+            value = datetime.date.today()
             setattr(model_instance, self.attname, value)
             return value
         else:
@@ -733 +733 @@
                 except ValueError:
                     raise exceptions.ValidationError(self.error_messages['invalid'])
 
+    def pre_save(self, model_instance, add):
+        if self.auto_now or (self.auto_now_add and add):
+            value = datetime.datetime.now()
+            setattr(model_instance, self.attname, value)
+            return value
+        else:
+            return super(DateTimeField, self).pre_save(model_instance, add)
+
     def get_prep_value(self, value):
         return self.to_python(value)
 

tests/regressiontests/datatypes/models.py

@@ -21 +21 @@
     def __str__(self):
         return self.name
 
+class RumBaba(models.Model):
+    backed_date = models.DateField(auto_now_add=True)
+    backed_time = models.DateTimeField(auto_now_add=True)
+
 __test__ = {'API_TESTS': """
 # No donuts are in the system yet.
 >>> Donut.objects.all()
@@ -98 +102 @@
 >>> Donut.objects.get(id=d2.id).review
 u'Outstanding'
 
+# Test for #10970, auto_now_add for DateField should evaluete to datetime.date instance
+
+>>> b = RumBaba()
+>>> b.save()
+>>> isinstance(b.backed_time, datetime.datetime)
+True
+>>> isinstance(b.backed_date, datetime.date)
+True
+
 """}
 
 # Regression test for #8354: the MySQL backend should raise an error if given