Fixed #9188 -- Fixed a case where we were generating syntactically invalid SQL in some exclude() queries.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9588 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2008-12-07 05:48:01 +00:00
parent e8707e068d
commit d4f0ae42a2
2 changed files with 19 additions and 1 deletions

View File

@ -1695,7 +1695,6 @@ class BaseQuery(object):
alias = self.get_initial_alias()
field, col, opts, joins, last, extra = self.setup_joins(
start.split(LOOKUP_SEP), opts, alias, False)
self.unref_alias(alias)
alias = joins[last[-1]]
self.select = [(alias, self.alias_map[alias][RHS_JOIN_COL])]
self.select_fields = [field]

View File

@ -227,6 +227,17 @@ class ReservedName(models.Model):
def __unicode__(self):
return self.name
# A simpler shared-foreign-key setup that can expose some problems.
class SharedConnection(models.Model):
data = models.CharField(max_length=10)
class PointerA(models.Model):
connection = models.ForeignKey(SharedConnection)
class PointerB(models.Model):
connection = models.ForeignKey(SharedConnection)
__test__ = {'API_TESTS':"""
>>> t1 = Tag.objects.create(name='t1')
>>> t2 = Tag.objects.create(name='t2', parent=t1)
@ -986,6 +997,14 @@ model. But it should still be possible to add new ordering after that.
>>> qs = Author.objects.order_by().order_by('name')
>>> 'ORDER BY' in qs.query.as_sql()[0]
True
Bug #9188 -- incorrect SQL was being generated for certain types of
exclude() queries that crossed multi-valued relations.
>>> PointerA.objects.filter(connection__pointerb__id=1)
[]
>>> PointerA.objects.exclude(connection__pointerb__id=1)
[]
"""}
# In Python 2.3 and the Python 2.6 beta releases, exceptions raised in __len__