Changeset 8794

Timestamp:

09/01/08 07:07:26 (3 months ago)

Author:

russellm

Message:

Fixed #7302: Corrected quoting of columns in extra_group_by. Thanks to Ivan Sagalaev for the patch and initial test.

Files:

• django/trunk/django/db/models/sql/query.py (modified) (1 diff)
• django/trunk/tests/modeltests/ordering/models.py (modified) (1 diff)
• django/trunk/tests/regressiontests/queries/models.py (modified) (2 diffs)

django/trunk/django/db/models/sql/query.py

@@ -630 +630 @@
-            else:
-                col, order = get_order_dir(field, asc)
-
+2
-                if distinct and elt not in select_aliases:
-                    ordering_aliases.append(elt)

django/trunk/tests/modeltests/ordering/models.py

@@ -78 +78 @@
->>> Article.objects.all().reverse()[:2]
-[<Article: Article 1>, <Article: Article 3>]
+
+# Ordering can be based on fields included from an 'extra' clause
+>>> Article.objects.extra(select={'foo': 'pub_date'}, order_by=['foo', 'headline'])
+[<Article: Article 1>, <Article: Article 2>, <Article: Article 3>, <Article: Article 4>]
+
+# If the extra clause uses an SQL keyword for a name, it will be protected by quoting.
+>>> Article.objects.extra(select={'order': 'pub_date'}, order_by=['order', 'headline'])
+[<Article: Article 1>, <Article: Article 2>, <Article: Article 3>, <Article: Article 4>]
+
-"""}

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

@@ -221 +221 @@
-    b = models.ForeignKey(LeafB)
-
+class ReservedName(models.Model):
+    name = models.CharField(max_length=20)
+    order = models.IntegerField()
+    
+    def __unicode__(self):
+        return self.name
+        
-__test__ = {'API_TESTS':"""
->>> t1 = Tag.objects.create(name='t1')
@@ -920 +927 @@
-[<Item: a_b>]
-
+Bug #7302: reserved names are appropriately escaped
+>>> _ = ReservedName.objects.create(name='a',order=42)
+>>> _ = ReservedName.objects.create(name='b',order=37)
+>>> ReservedName.objects.all().order_by('order')
+[<ReservedName: b>, <ReservedName: a>]
+
+>>> ReservedName.objects.extra(select={'stuff':'name'}, order_by=('order','stuff'))
+[<ReservedName: b>, <ReservedName: a>]
+ 
-"""}
-