Changeset 8690

Timestamp:

08/28/08 21:40:50 (3 months ago)

Author:

mtredinnick

Message:

Fixed #7823 -- Fixed an edge case in RelatedField?.get_db_prep_lookup() so that
it works correctly with custom field subclasses. Patch from Ivan Sagalaev.

Files:

• django/trunk/django/db/models/fields/related.py (modified) (2 diffs)

django/trunk/django/db/models/fields/related.py

@@ -126 +126 @@
-            # the primary key may itself be an object - so we need to keep drilling
-            # down until we hit a value that can be used for a comparison.
- = valu
+, field = value, Non
-            try:
-                while True:
- = getattr(v, v._meta.pk.name)
+, field = getattr(v, v._meta.pk.name), v._meta.pk
-            except AttributeError:
-                pass
+            if field:
+                if lookup_type in ('range', 'in'):
+                    v = [v]
+                v = field.get_db_prep_lookup(lookup_type, v)
+                if isinstance(v, list):
+                    v = v[0]
-            return v
-
@@ -139 +145 @@
-        if lookup_type == 'exact':
-            return [pk_trace(value)]
-== 'in'
+in ('range', 'in')
-            return [pk_trace(v) for v in value]
-        elif lookup_type == 'isnull':