Refactored out some code into djangotoolbox

https://bitbucket.org/wkornewald/djangotoolbox/changeset/84e1eef5ddff

Author: jonashaag

django_mongodb_engine/compiler.py

@@ -403,6 +403,7 @@ def execute_sql(self, result_type=MULTI):
             ret.append(result)
         return ret
 
+
 class SQLInsertCompiler(NonrelInsertCompiler, SQLCompiler):
     @safe_call
     def insert(self, data, return_id=False):
@@ -412,39 +413,21 @@ def insert(self, data, return_id=False):
             pass
         return self._save(data, return_id)
 
+
 # TODO: Define a common nonrel API for updates and add it to the nonrel
 # backend base classes and port this code to that API
 class SQLUpdateCompiler(NonrelUpdateCompiler, SQLCompiler):
     query_class = MongoQuery
 
-    @safe_call
-    def execute_raw(self, update_spec, multi=True, **kwargs):
-        collection = self.get_collection()
-        criteria = self.build_query()._mongo_query
-        options = self.connection.operation_flags.get('update', {})
-        options = dict(options, **kwargs)
-        info = collection.update(criteria, update_spec, multi=multi, **options)
-        if info is not None:
-            return info.get('n')
-
-    def execute_sql(self, result_type):
-        return self.execute_raw(*self._get_update_spec())
-
-    def _get_update_spec(self):
+    def update(self, values):
         multi = True
         spec = {}
-        for field, _, value in self.query.values:
+        for field, value in values:
             if getattr(field, 'forbids_updates', False):
                 raise DatabaseError("Updates on %ss are not allowed" %
                                     field.__class__.__name__)
             if field.unique:
                 multi = False
-            if hasattr(value, 'prepare_database_save'):
-                value = value.prepare_database_save(field)
-            else:
-                value = field.get_db_prep_save(value, connection=self.connection)
-
-            value = self.convert_value_for_db(field.db_type(connection=self.connection), value)
             if hasattr(value, "evaluate"):
                 assert value.connector in (value.ADD, value.SUB)
                 assert not value.negated
@@ -465,7 +448,18 @@ def _get_update_spec(self):
                 raise DatabaseError("Can not modify _id")
             spec.setdefault(action, {})[column] = value
 
-        return spec, multi
+        return self.execute_update(spec, multi)
+
+    @safe_call
+    def execute_update(self, update_spec, multi=True, **kwargs):
+        collection = self.get_collection()
+        criteria = self.build_query()._mongo_query
+        options = self.connection.operation_flags.get('update', {})
+        options = dict(options, **kwargs)
+        info = collection.update(criteria, update_spec, multi=multi, **options)
+        if info is not None:
+            return info.get('n')
+
 
 class SQLDeleteCompiler(NonrelDeleteCompiler, SQLCompiler):
     pass

django_mongodb_engine/contrib/__init__.py

@@ -46,7 +46,7 @@ def raw_update(self, spec_or_q, update_dict, **kwargs):
             queryset = self.filter(spec_or_q)
         queryset._for_write = True
         compiler = _compiler_for_queryset(queryset, 'SQLUpdateCompiler')
-        compiler.execute_raw(update_dict, **kwargs)
+        compiler.execute_update(update_dict, **kwargs)
 
     raw_update.alters_data = True