Fixed #13640: Avoid generating an exception when a model has an attribute named 'evaluate'. Thanks LukaszKorzybski and tobias.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17093 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Karen Tracey 2011-11-13 15:09:08 +00:00
parent 0db571b417
commit b8353016b7
2 changed files with 17 additions and 1 deletions

View File

@ -14,6 +14,7 @@ from django.utils.encoding import force_unicode
from django.utils.tree import Node from django.utils.tree import Node
from django.db import connections, DEFAULT_DB_ALIAS from django.db import connections, DEFAULT_DB_ALIAS
from django.db.models import signals from django.db.models import signals
from django.db.models.expressions import ExpressionNode
from django.db.models.fields import FieldDoesNotExist from django.db.models.fields import FieldDoesNotExist
from django.db.models.query_utils import InvalidQuery from django.db.models.query_utils import InvalidQuery
from django.db.models.sql import aggregates as base_aggregates_module from django.db.models.sql import aggregates as base_aggregates_module
@ -1064,7 +1065,7 @@ class Query(object):
value = True value = True
elif callable(value): elif callable(value):
value = value() value = value()
elif hasattr(value, 'evaluate'): elif isinstance(value, ExpressionNode):
# If value is a query expression, evaluate it # If value is a query expression, evaluate it
value = SQLEvaluator(value, self) value = SQLEvaluator(value, self)
having_clause = value.contains_aggregate having_clause = value.contains_aggregate

View File

@ -164,8 +164,23 @@ class ModelTests(TestCase):
1 1
) )
class ModelValidationTest(TestCase): class ModelValidationTest(TestCase):
def test_pk_validation(self): def test_pk_validation(self):
one = NonAutoPK.objects.create(name="one") one = NonAutoPK.objects.create(name="one")
again = NonAutoPK(name="one") again = NonAutoPK(name="one")
self.assertRaises(ValidationError, again.validate_unique) self.assertRaises(ValidationError, again.validate_unique)
class EvaluateMethodTest(TestCase):
"""
Regression test for #13640: cannot filter by objects with 'evaluate' attr
"""
def test_model_with_evaluate_method(self):
"""
Ensures that you can filter by objects that have an 'evaluate' attr
"""
dept = Department.objects.create(pk=1, name='abc')
dept.evaluate = 'abc'
Worker.objects.filter(department=dept)