Changeset 8814

Timestamp:

09/01/08 16:04:01 (3 months ago)

Author:

jacob

Message:

Fixed #8076: fixed get_(next/previous)_by_date when used with subclasses. Thanks, bjornkri and jan_oberst.

Files:

• django/trunk/django/db/models/fields/related.py (modified) (1 diff)
• django/trunk/tests/regressiontests/model_inheritance_regress/models.py (modified) (2 diffs)

django/trunk/django/db/models/fields/related.py

@@ -143 +143 @@
-            sql, params = value.as_sql()
-            return QueryWrapper(('(%s)' % sql), params)
-
+
+
+
+
+
+
-            return [pk_trace(value)]
-        if lookup_type in ('range', 'in'):

django/trunk/tests/regressiontests/model_inheritance_regress/models.py

@@ -59 +59 @@
-class SelfRefChild(SelfRefParent):
-    child_data = models.IntegerField()
+
+class Article(models.Model):
+    headline = models.CharField(max_length=100)
+    pub_date = models.DateTimeField()
+    class Meta:
+        ordering = ('-pub_date', 'headline')
+
+    def __unicode__(self):
+        return self.headline
+
+class ArticleWithAuthor(Article):
+    author = models.CharField(max_length=100) 
-
-__test__ = {'API_TESTS':"""
@@ -195 +207 @@
->>> obj.delete()
-
+# Regression tests for #8076 - get_(next/previous)_by_date should 
+>>> c1 = ArticleWithAuthor(headline='ArticleWithAuthor 1', author="Person 1", pub_date=datetime.datetime(2005, 8, 1, 3, 0))
+>>> c1.save()
+>>> c2 = ArticleWithAuthor(headline='ArticleWithAuthor 2', author="Person 2", pub_date=datetime.datetime(2005, 8, 1, 10, 0))
+>>> c2.save()
+>>> c3 = ArticleWithAuthor(headline='ArticleWithAuthor 3', author="Person 3", pub_date=datetime.datetime(2005, 8, 2))
+>>> c3.save()
+
+>>> c1.get_next_by_pub_date()
+<ArticleWithAuthor: ArticleWithAuthor 2>
+>>> c2.get_next_by_pub_date()
+<ArticleWithAuthor: ArticleWithAuthor 3>
+>>> c3.get_next_by_pub_date()
+Traceback (most recent call last):
+    ...
+DoesNotExist: ArticleWithAuthor matching query does not exist.
+>>> c3.get_previous_by_pub_date()
+<ArticleWithAuthor: ArticleWithAuthor 2>
+>>> c2.get_previous_by_pub_date()
+<ArticleWithAuthor: ArticleWithAuthor 1>
+>>> c1.get_previous_by_pub_date()
+Traceback (most recent call last):
+    ...
+DoesNotExist: ArticleWithAuthor matching query does not exist.
+
-"""}