Author: Alex
Date: 2010-11-04 11:37:00 -0500 (Thu, 04 Nov 2010)
New Revision: 14462
Modified:
django/trunk/django/db/models/sql/subqueries.py
Log:
Fixed a test failure introduced in [14461].
Modified: django/trunk/django/db/models/sql/subqueries.py
===================================================================
--- django/trunk/django/db/models/sql/subqueries.py 2010-11-04 16:03:05 UTC
(rev 14461)
+++ django/trunk/django/db/models/sql/subqueries.py 2010-11-04 16:37:00 UTC
(rev 14462)
@@ -4,7 +4,7 @@
from django.core.exceptions import FieldError
from django.db import connections
-from django.db.models.fields import DateField
+from django.db.models.fields import DateField, FieldDoesNotExist
from django.db.models.sql.constants import *
from django.db.models.sql.datastructures import Date
from django.db.models.sql.expressions import SQLEvaluator
@@ -189,12 +189,17 @@
"""
Converts the query into a date extraction query.
"""
- result = self.setup_joins(
- field_name.split(LOOKUP_SEP),
- self.get_meta(),
- self.get_initial_alias(),
- False
- )
+ try:
+ result = self.setup_joins(
+ field_name.split(LOOKUP_SEP),
+ self.get_meta(),
+ self.get_initial_alias(),
+ False
+ )
+ except FieldError:
+ raise FieldDoesNotExist("%s has no field named '%s'" % (
+ self.model._meta.object_name, field_name
+ ))
field = result[0]
assert isinstance(field, DateField), "%r isn't a DateField." \
% field.name
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
