Fixed #7098 -- Old-style related-model order_by() syntax was being incorrectly

marked as erroneous. It's just more dangerous and risky, not forbidden. This
commit restores backwards compatibility there.


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

django/db/models/sql/constants.py

@@ -28,7 +28,7 @@ NULLABLE = 6
 MULTI = 'multi'
 SINGLE = 'single'
 
-ORDER_PATTERN = re.compile(r'\?|[-+]?\w+$')
+ORDER_PATTERN = re.compile(r'\?|[-+]?[.\w]+$')
 ORDER_DIR = {
     'ASC': ('ASC', 'DESC'),
     'DESC': ('DESC', 'ASC')}

tests/regressiontests/queries/models.py

@@ -654,5 +654,9 @@ Bug #7045 -- extra tables used to crash SQL construction on the second use.
 >>> s = qs.query.as_sql()
 >>> s = qs.query.as_sql()   # test passes if this doesn't raise an exception.
 
+Bug #7098 -- Make sure semi-deprecated ordering by related models syntax still
+works.
+>>> Item.objects.values('note__note').order_by('queries_note.note', 'id')
+[{'note__note': u'n2'}, {'note__note': u'n3'}, {'note__note': u'n3'}, {'note__note': u'n3'}]
 """}