Fixed #8039 -- Make sure that extra(tables=...) tables are always included in

the resulting SQL. Previously, an optimisation was removing them in some corner
cases.


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

1 files changed, 11 insertions, 0 deletions

diff --git a/tests/regressiontests/extra_regress/models.py b/tests/regressiontests/extra_regress/models.py
index 8c624defc4..500773d610 100644
--- a/tests/regressiontests/extra_regress/models.py
+++ b/tests/regressiontests/extra_regress/models.py
@@ -24,6 +24,10 @@ class RevisionableModel(models.Model):
         new_revision.pk = None
         return new_revision
 
+class Order(models.Model):
+    created_by = models.ForeignKey(User)
+    text = models.TextField()
+
 __test__ = {"API_TESTS": """
 # Regression tests for #7314 and #7372
 
@@ -87,4 +91,11 @@ True
 >>> qs[:1]
 [<User: fred>]
 
+# Regression test for #8039: Ordering sometimes removed relevant tables from
+# extra(). This test is the critical case: ordering uses a table, but then
+# removes the reference because of an optimisation. The table should still be
+# present because of the extra() call.
+>>> Order.objects.extra(where=["username=%s"], params=["fred"], tables=["auth_user"]).order_by('created_by')
+[]
+
 """}