Ticket #3182: update_or_create.diff

django/db/models/manager.py

@@ -68 +68 @@
-
-    def get_or_create(self, **kwargs):
-        return self.get_query_set().get_or_create(**kwargs)
-
+
+
+
+
-    def create(self, **kwargs):
-        return self.get_query_set().create(**kwargs)
-

django/db/models/query.py

@@ -240 +240 @@
-            obj.save()
-            return obj, True
-
+    def update_or_create(self, **kwargs):
+        """
+        Looks up an object with the given kwargs, creating one if necessary.
+        If the object already exists, then its fields are updated with the
+        values passed in the defaults dictionary.
+        Returns a tuple of (object, created), where created is a boolean
+        specifying whether an object was created.
+        """
+        obj, created = self.get_or_create(**kwargs)
+        if not created:
+            obj.update(**kwargs.pop('defaults', {}))
+        return obj, created
+
-    def latest(self, field_name=None):
-        """
-        Returns the latest object, according to the model's 'get_latest_by'