From 8f81ef7f1e14de12526aa6208872e8b812a0416e Mon Sep 17 00:00:00 2001 From: wrwrwr Date: Wed, 15 Feb 2012 20:22:57 +0100 Subject: [PATCH] Don't delude we're quoting anything and simplify update_entity. --- db/compiler.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/db/compiler.py b/db/compiler.py index 984f69f..c37cc47 100644 --- a/db/compiler.py +++ b/db/compiler.py @@ -406,8 +406,6 @@ def update_entity(self, pk, pk_field): if not gae_query.matches_filters(entity): return - qn = self.quote_name_unless_alias - update_dict = {} for field, _, value in self.query.values: if hasattr(value, 'prepare_database_save'): value = value.prepare_database_save(field) @@ -422,14 +420,9 @@ def update_entity(self, pk, pk_field): allow_joins=False) if hasattr(value, 'as_sql'): - # Evaluate expression and return the new value. - val = value.as_sql(qn, self.connection) - update_dict[field] = val - else: - update_dict[field] = value + value = value.as_sql(lambda n: n, self.connection) - for field, value in update_dict.iteritems(): - entity[qn(field.column)] = self.value_for_db(value, field) + entity[field.column] = self.value_for_db(value, field) Put(entity)