Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #15823 - incorrect join condition when combining Q objects

Thanks to dcwatson for the excellent report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16159 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit db5807bdb1f242cc928e2fdf7110cb20af34790f 1 parent 970ae01
@spookylukey spookylukey authored
View
6 django/db/models/sql/query.py
@@ -457,7 +457,11 @@ def combine(self, rhs, connector):
# An unused alias.
continue
promote = (rhs.alias_map[alias][JOIN_TYPE] == self.LOUTER)
- new_alias = self.join(rhs.rev_join_map[alias],
+ lhs, table, lhs_col, col = rhs.rev_join_map[alias]
+ # If the left side of the join was already relabeled, use the
+ # updated alias.
+ lhs = change_map.get(lhs, lhs)
+ new_alias = self.join((lhs, table, lhs_col, col),
(conjunction and not first), used, promote, not conjunction)
used.add(new_alias)
change_map[alias] = new_alias
View
13 tests/regressiontests/null_fk/models.py
@@ -31,3 +31,16 @@ class Meta:
def __unicode__(self):
return self.comment_text
+
+# Ticket 15823
+
+class Item(models.Model):
+ title = models.CharField(max_length=100)
+
+class PropertyValue(models.Model):
+ label = models.CharField(max_length=100)
+
+class Property(models.Model):
+ item = models.ForeignKey(Item, related_name='props')
+ key = models.CharField(max_length=100)
+ value = models.ForeignKey(PropertyValue, null=True)
View
23 tests/regressiontests/null_fk/tests.py
@@ -1,4 +1,5 @@
from django.test import TestCase
+from django.db.models import Q
from regressiontests.null_fk.models import *
@@ -40,3 +41,25 @@ def test_null_fk(self):
],
transform = lambda c: (c.id, c.comment_text, repr(c.post))
)
+
+ def test_combine_isnull(self):
+ item = Item.objects.create(title='Some Item')
+ pv = PropertyValue.objects.create(label='Some Value')
+ item.props.create(key='a', value=pv)
+ item.props.create(key='b') # value=NULL
+ q1 = Q(props__key='a', props__value=pv)
+ q2 = Q(props__key='b', props__value__isnull=True)
+
+ # Each of these individually should return the item.
+ self.assertEqual(Item.objects.get(q1), item)
+ self.assertEqual(Item.objects.get(q2), item)
+
+ # Logically, qs1 and qs2, and qs3 and qs4 should be the same.
+ qs1 = Item.objects.filter(q1) & Item.objects.filter(q2)
+ qs2 = Item.objects.filter(q2) & Item.objects.filter(q1)
+ qs3 = Item.objects.filter(q1) | Item.objects.filter(q2)
+ qs4 = Item.objects.filter(q2) | Item.objects.filter(q1)
+
+ # Regression test for #15823.
+ self.assertEqual(list(qs1), list(qs2))
+ self.assertEqual(list(qs3), list(qs4))
Please sign in to comment.
Something went wrong with that request. Please try again.