Fixed #13935, added support for using QuerySet.dates across related fields. Thanks to valyagolev for his work on the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14461 bcc190cf-cafb-0310-a4f2-bffc1f526a37

3 files changed, 104 insertions, 0 deletions

diff --git a/tests/regressiontests/dates/__init__.py b/tests/regressiontests/dates/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/regressiontests/dates/__init__.py
diff --git a/tests/regressiontests/dates/models.py b/tests/regressiontests/dates/models.py
new file mode 100644
index 0000000000..e1fc1e74fe
--- /dev/null
+++ b/tests/regressiontests/dates/models.py
@@ -0,0 +1,23 @@
+from django.db import models
+
+
+class Article(models.Model):
+    title = models.CharField(max_length=100)
+    pub_date = models.DateField()
+
+    categories = models.ManyToManyField("Category", related_name="articles")
+
+    def __unicode__(self):
+        return self.title
+
+class Comment(models.Model):
+    article = models.ForeignKey(Article, related_name="comments")
+    text = models.TextField()
+    pub_date = models.DateField()
+    approval_date = models.DateField(null=True)
+
+    def __unicode__(self):
+        return 'Comment to %s (%s)' % (self.article.title, self.pub_date)
+
+class Category(models.Model):
+    name = models.CharField(max_length=255)
diff --git a/tests/regressiontests/dates/tests.py b/tests/regressiontests/dates/tests.py
new file mode 100644
index 0000000000..769d074215
--- /dev/null
+++ b/tests/regressiontests/dates/tests.py
@@ -0,0 +1,81 @@
+from datetime import datetime
+
+from django.test import TestCase
+
+from models import Article, Comment, Category
+
+
+class DatesTests(TestCase):
+    def test_related_model_traverse(self):
+        a1 = Article.objects.create(
+            title="First one",
+            pub_date=datetime(2005, 7, 28),
+        )
+        a2 = Article.objects.create(
+            title="Another one",
+            pub_date=datetime(2010, 7, 28),
+        )
+        a3 = Article.objects.create(
+            title="Third one, in the first day",
+            pub_date=datetime(2005, 7, 28),
+        )
+
+        a1.comments.create(
+            text="Im the HULK!",
+            pub_date=datetime(2005, 7, 28),
+        )
+        a1.comments.create(
+            text="HULK SMASH!",
+            pub_date=datetime(2005, 7, 29),
+        )
+        a2.comments.create(
+            text="LMAO",
+            pub_date=datetime(2010, 7, 28),
+        )
+        a3.comments.create(
+            text="+1",
+            pub_date=datetime(2005, 8, 29),
+        )
+
+        c = Category.objects.create(name="serious-news")
+        c.articles.add(a1, a3)
+
+        self.assertQuerysetEqual(
+            Comment.objects.dates("article__pub_date", "year"), [
+                datetime(2005, 1, 1),
+                datetime(2010, 1, 1),
+            ],
+            lambda d: d,
+        )
+        self.assertQuerysetEqual(
+            Comment.objects.dates("article__pub_date", "month"), [
+                datetime(2005, 7, 1),
+                datetime(2010, 7, 1),
+            ],
+            lambda d: d
+        )
+        self.assertQuerysetEqual(
+            Comment.objects.dates("article__pub_date", "day"), [
+                datetime(2005, 7, 28),
+                datetime(2010, 7, 28),
+            ],
+            lambda d: d
+        )
+        self.assertQuerysetEqual(
+            Article.objects.dates("comments__pub_date", "day"), [
+                datetime(2005, 7, 28),
+                datetime(2005, 7, 29),
+                datetime(2005, 8, 29),
+                datetime(2010, 7, 28),
+            ],
+            lambda d: d
+        )
+        self.assertQuerysetEqual(
+            Article.objects.dates("comments__approval_date", "day"), []
+        )
+        self.assertQuerysetEqual(
+            Category.objects.dates("articles__pub_date", "day"), [
+                datetime(2005, 7, 28),
+            ],
+            lambda d: d,
+        )