Ticket #10302: ticket_10302.diff

tests/expressions/tests.py

@@ -21 +21 @@
 from django.test.utils import Approximate
 from django.utils import six
 from django.utils.timezone import utc
-
 from .models import UUID, Company, Employee, Experiment, Number, Time
 
 
@@ -385 +384 @@
         )
         self.assertEqual(str(qs.query).count('JOIN'), 2)
 
+    def test_ticket_10302_date_grouping(self):
+        dtime = datetime.datetime(2015, 1, 7, 12, 6, 30)
+        Experiment.objects.bulk_create([
+            Experiment(name="Experiment A", assigned=dtime.date(), completed=dtime.date(),
+                       estimated_time=datetime.timedelta(days=1), start=dtime, end=dtime + datetime.timedelta(hours=1)),
+            Experiment(name="Experiment A", assigned=dtime.date(), completed=dtime.date(),
+                       estimated_time=datetime.timedelta(days=1), start=dtime, end=dtime + datetime.timedelta(hours=1)),
+            Experiment(name="Experiment A", assigned=dtime.date(), completed=dtime.date(),
+                       estimated_time=datetime.timedelta(days=1), start=dtime + datetime.timedelta(hours=1),
+                       end=dtime + datetime.timedelta(hours=2))
+        ])
+        assert list(Experiment.objects.values('start').annotate(num=Count('id'))) == [
+            {'num': 2, 'start': datetime.datetime(2015, 1, 7, 12, 6, 30)},
+            {'num': 1, 'start': datetime.datetime(2015, 1, 7, 13, 6, 30)}
+        ]
+        assert list(
+            Experiment.objects.values('assigned').annotate(num=Count('id'))) == [
+                   {'num': 3, 'assigned': datetime.date(2015, 1, 7)}
+               ]
+        assert list(
+            Experiment.objects.annotate(date=Date('start', 'day')).values('date').annotate(num=Count('id'))) == [
+                   {'num': 3, 'date': datetime.date(2015, 1, 7)}
+               ]
+
 
 class ExpressionsTests(TestCase):