Fixed #25774 -- Refactor datetime expressions into public API

2 files changed, 7 insertions, 0 deletions

diff --git a/tests/datetimes/models.py b/tests/datetimes/models.py
index 47ce417e4c..2fcb72be09 100644
--- a/tests/datetimes/models.py
+++ b/tests/datetimes/models.py
@@ -8,6 +8,7 @@ from django.utils.encoding import python_2_unicode_compatible
 class Article(models.Model):
     title = models.CharField(max_length=100)
     pub_date = models.DateTimeField()
+    published_on = models.DateField(null=True)
 
     categories = models.ManyToManyField("Category", related_name="articles")
 
diff --git a/tests/datetimes/tests.py b/tests/datetimes/tests.py
index 447cbef99a..5bd3bc6d5f 100644
--- a/tests/datetimes/tests.py
+++ b/tests/datetimes/tests.py
@@ -153,3 +153,9 @@ class DateTimesTests(TestCase):
             datetime.datetime(2005, 7, 30, 0, 0),
             datetime.datetime(2005, 7, 29, 0, 0),
             datetime.datetime(2005, 7, 28, 0, 0)])
+
+    def test_datetimes_disallows_date_fields(self):
+        dt = datetime.datetime(2005, 7, 28, 12, 15)
+        Article.objects.create(pub_date=dt, published_on=dt.date(), title="Don't put dates into datetime functions!")
+        with self.assertRaisesMessage(ValueError, "Cannot truncate DateField 'published_on' to DateTimeField"):
+            list(Article.objects.datetimes('published_on', 'second'))