From 65246de7b1d70d25831ab394c4f4a75813f629fe Mon Sep 17 00:00:00 2001 From: Michał Modzelewski Date: Fri, 2 Jan 2015 02:39:31 +0100 Subject: Fixed #24031 -- Added CASE expressions to the ORM. --- django/db/models/sql/compiler.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'django/db/models/sql/compiler.py') diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py index b091571835..ebda3be96f 100644 --- a/django/db/models/sql/compiler.py +++ b/django/db/models/sql/compiler.py @@ -998,7 +998,9 @@ class SQLUpdateCompiler(SQLCompiler): values, update_params = [], [] for field, model, val in self.query.values: if hasattr(val, 'resolve_expression'): - val = val.resolve_expression(self.query, allow_joins=False) + val = val.resolve_expression(self.query, allow_joins=False, for_save=True) + if val.contains_aggregate: + raise FieldError("Aggregate functions are not allowed in this query") elif hasattr(val, 'prepare_database_save'): if field.rel: val = val.prepare_database_save(field) -- cgit v1.3