Author: mtredinnick
Date: 2009-03-07 21:37:47 -0600 (Sat, 07 Mar 2009)
New Revision: 9987
Modified:
django/branches/releases/1.0.X/django/db/models/sql/where.py
django/branches/releases/1.0.X/tests/regressiontests/queries/models.py
Log:
[1.0.X] Fixed #10432 -- Handle all kinds of iterators in queryset filters.
Only consumes the iterators once and works with Python 2.3.
Backport of r9986 from trunk.
Modified: django/branches/releases/1.0.X/django/db/models/sql/where.py
===================================================================
--- django/branches/releases/1.0.X/django/db/models/sql/where.py
2009-03-08 03:32:16 UTC (rev 9986)
+++ django/branches/releases/1.0.X/django/db/models/sql/where.py
2009-03-08 03:37:47 UTC (rev 9987)
@@ -43,6 +43,10 @@
return
alias, col, field, lookup_type, value = data
+ if hasattr(value, '__iter__') and hasattr(value, 'next'):
+ # Consume any generators immediately, so that we can determine
+ # emptiness and transform any non-empty values correctly.
+ value = list(value)
try:
if field:
params = field.get_db_prep_lookup(lookup_type, value)
Modified: django/branches/releases/1.0.X/tests/regressiontests/queries/models.py
===================================================================
--- django/branches/releases/1.0.X/tests/regressiontests/queries/models.py
2009-03-08 03:32:16 UTC (rev 9986)
+++ django/branches/releases/1.0.X/tests/regressiontests/queries/models.py
2009-03-08 03:37:47 UTC (rev 9987)
@@ -1068,6 +1068,19 @@
>>> Tag.objects.filter(name__in=()).update(name="foo")
0
+Bug #10432 (see also the Python 2.4+ tests for this, below). Testing an empty
+"__in" filter with a generator as the value.
+>>> def f():
+... return iter([])
+>>> n_obj = Note.objects.all()[0]
+>>> def g():
+... for i in [n_obj.pk]:
+... yield i
+>>> Note.objects.filter(pk__in=f())
+[]
+>>> list(Note.objects.filter(pk__in=g())) == [n_obj]
+True
+
"""}
# In Python 2.3 and the Python 2.6 beta releases, exceptions raised in __len__
@@ -1101,3 +1114,14 @@
[]
"""
+
+# Generator expressions are only in Python 2.4 and later.
+if sys.version_info >= (2, 4):
+ __test__["API_TESTS"] += """
+Using an empty generator expression as the rvalue for an "__in" lookup is legal
+(regression for #10432).
+>>> Note.objects.filter(pk__in=(x for x in ()))
+[]
+
+"""
+
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
