Changeset 7494

Timestamp:

04/28/08 02:07:17 (3 months ago)

Author:

mtredinnick

Message:

Allow Query objects to be values in query filters. This already existed for
relations, but not for normal fields. The latter comes up naturally in some
update statements.

Refs #7095

Files:

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

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

@@ -10 +10 @@
-from django.db import get_creation_module
-from django.db.models import signals
+from django.db.models.query_utils import QueryWrapper
-from django.dispatch import dispatcher
-from django.conf import settings
@@ -227 +228 @@
-    def get_db_prep_lookup(self, lookup_type, value):
-        "Returns field's value prepared for database lookup."
+        if hasattr(value, 'as_sql'):
+            sql, params = value.as_sql()
+            return QueryWrapper(('(%s)' % sql), params)
-        if lookup_type in ('exact', 'regex', 'iregex', 'gt', 'gte', 'lt', 'lte', 'month', 'day', 'search'):
-            return [value]