From 556fbc78a636d2be5c66a4393361476a6de091bc Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Sun, 17 Aug 2008 22:38:36 +0000 Subject: [PATCH] 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 --- django/db/models/sql/query.py | 5 ++++- tests/regressiontests/extra_regress/models.py | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 2548d63100..8cf3f58105 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -542,7 +542,10 @@ class Query(object): first = False for t in self.extra_tables: alias, unused = self.table_alias(t) - if alias not in self.alias_map: + # Only add the alias if it's not already present (the table_alias() + # calls increments the refcount, so an alias refcount of one means + # this is the only reference. + if alias not in self.alias_map or self.alias_refcount[alias] == 1: connector = not first and ', ' or '' result.append('%s%s' % (connector, qn(alias))) first = False 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] [] +# 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') +[] + """}