Changeset 8415

Timestamp:

08/16/08 15:59:06 (11 months ago)

Author:

gwilson

Message:

Fixed #3121 -- Made get_or_create() work for RelatedManager and ManyRelatedManager.

Files:

• django/trunk/django/db/models/fields/related.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/get_or_create_regress (added)
• django/trunk/tests/regressiontests/get_or_create_regress/__init__.py (added)
• django/trunk/tests/regressiontests/get_or_create_regress/models.py (added)

django/trunk/django/db/models/fields/related.py

@@ -312 +312 @@
-            create.alters_data = True
-
+            def get_or_create(self, **kwargs):
+                # Update kwargs with the related object that this
+                # ForeignRelatedObjectsDescriptor knows about.
+                kwargs.update({rel_field.name: instance})
+                return super(RelatedManager, self).get_or_create(**kwargs)
+            get_or_create.alters_data = True
+
-            # remove() and clear() are only provided if the ForeignKey can have a value of null.
-            if rel_field.null:
@@ -409 +416 @@
-            return new_obj
-        create.alters_data = True
+
+        def get_or_create(self, **kwargs):
+            obj, created = \
+                    super(ManyRelatedManager, self).get_or_create(**kwargs)
+            # We only need to add() if created because if we got an object back
+            # from get() then the relationship already exists.
+            if created:
+                self.add(obj)
+            return obj, created
+        get_or_create.alters_data = True
-
-        def _add_items(self, source_col_name, target_col_name, *objs):