Changeset 9251

Timestamp:

10/24/08 01:09:47 (3 months ago)

Author:

mtredinnick

Message:

Fixed #9406 -- Ensure that each database column is only represented once in the
"ORDER BY" clause of an SQL statement.

Files:

• django/trunk/django/db/models/sql/query.py (modified) (3 diffs)
• django/trunk/tests/regressiontests/model_inheritance_regress/models.py (modified) (1 diff)

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

@@ -622 +622 @@
-        else:
-            asc, desc = ORDER_DIR['DESC']
+
+        # It's possible, due to model inheritance, that normal usage might try
+        # to include the same field more than once in the ordering. We track
+        # the table/column pairs we use and discard any after the first use.
+        processed_pairs = set()
+
-        for field in ordering:
-            if field == '?':
@@ -639 +645 @@
-                col, order = get_order_dir(field, asc)
-                table, col = col.split('.', 1)
-
-
-
+
+
+
+
+
-            elif get_order_dir(field)[0] not in self.extra_select:
-                # 'col' is of the form 'field' or 'field1__field2' or
@@ -647 +655 @@
-                for table, col, order in self.find_ordering_name(field,
-                        self.model._meta, default_order=asc):
-
-
-
-
+
+
+
+
+
+
-            else:
-                col, order = get_order_dir(field, asc)

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

@@ -258 +258 @@
->>> _ = QualityControl.objects.create(headline="Problems in Django", pub_date=datetime.datetime.now(), quality=10, assignee="adrian")
-
+# Ordering should not include any database column more than once (this is most
+# likely to ocurr naturally with model inheritance, so we check it here).
+# Regression test for #9390. This necessarily pokes at the SQL string for the
+# query, since the duplicate problems are only apparent at that late stage.
+>>> sql = ArticleWithAuthor.objects.order_by('pub_date', 'pk').query.as_sql()[0]
+>>> fragment = sql[sql.find('ORDER BY'):]
+>>> pos = fragment.find('pub_date')
+>>> fragment.find('pub_date', pos + 1) == -1
+True
+
-"""}