Ticket #10672: 10672.diff

django/db/models/base.py

@@ -416 +416 @@
         override this method. It's separate from save() in order to hide the
         need for overrides of save() to pass around internal-only parameters
         ('raw' and 'cls').
+
+        Returns True if the instance has been inserted, otherwise False if it
+        has been updated.
         """
         assert not (force_insert and force_update)
         if not cls:
@@ -439 +442 @@
                 if field and getattr(self, parent._meta.pk.attname) is None and getattr(self, field.attname) is not None:
                     setattr(self, parent._meta.pk.attname, getattr(self, field.attname))
 
-                self.save_base(cls=parent)
+                record_exists = not self.save_base(cls=parent)
                 if field:
                     setattr(self, field.attname, self._get_pk_val(parent._meta))
-            if meta.proxy:
-                return
 
         if not meta.proxy:
             non_pks = [f for f in meta.local_fields if not f.primary_key]
@@ -494 +495 @@
             signals.post_save.send(sender=self.__class__, instance=self,
                 created=(not record_exists), raw=raw)
 
+        return (not record_exists)
+
     save_base.alters_data = True
 
     def _collect_sub_objects(self, seen_objs, parent=None, nullable=False):

tests/modeltests/force_insert_update/models.py

@@ -60 +60 @@
 ...
 DatabaseError: ...
 
+# Model's internal save_base() method should return True on insert and False on update
+>>> cc3 = Counter(name=u"three", value=3)
+>>> cc3.save_base()
+True
+>>> cc3.name = u"THREE"
+>>> cc3.save_base()
+False
+>>> cc3.name = u"Thr33"
+>>> cc3.save_base(force_update=True)
+False
+>>> cc4 = Counter(name=u"four", value=4)
+>>> cc4.save_base(force_insert=True)
+True
 """
 }

tests/modeltests/proxy_models/models.py

@@ -171 +171 @@
 [<OtherPerson: barney>, <OtherPerson: fred>]
 >>> OtherPerson._default_manager.all()
 [<OtherPerson: barney>, <OtherPerson: wilma>]
+
+
+# Test save signals for proxy models
+>>> from django.db.models import signals
+>>> def foo(*args, **kwargs): print u"Foo"
+...
+>>> def bar(*args, **kwargs): print u"Bar"
+...
+>>> signals.pre_save.connect(foo, sender=MyPerson)
+>>> signals.post_save.connect(bar, sender=MyPerson)
+>>> dino = MyPerson.objects.create(name=u"dino")
+Foo
+Bar
 """}
 
 

tests/modeltests/signals/models.py

@@ -63 +63 @@
 post_save signal, Tom Smith
 Is updated
 Is raw
+False
 
 >>> p1.delete()
 pre_delete signal, Tom Smith

tests/regressiontests/model_inheritance_regress/models.py

@@ -121 +121 @@
 # Create a child-parent-grandparent chain
 >>> place1 = Place(name="Guido's House of Pasta", address='944 W. Fullerton')
 >>> place1.save_base(raw=True)
+True
 >>> restaurant = Restaurant(place_ptr=place1, serves_hot_dogs=True, serves_pizza=False)
 >>> restaurant.save_base(raw=True)
+True
 >>> italian_restaurant = ItalianRestaurant(restaurant_ptr=restaurant, serves_gnocchi=True)
 >>> italian_restaurant.save_base(raw=True)
+True
 
 # Create a child-parent chain with an explicit parent link
 >>> place2 = Place(name='Main St', address='111 Main St')
 >>> place2.save_base(raw=True)
+True
 >>> park = ParkingLot(parent=place2, capacity=100)
 >>> park.save_base(raw=True)
+True
 
 # Check that no extra parent objects have been created.
 >>> Place.objects.all()
@@ -148 +153 @@
 >>> [sorted(d.items()) for d in dicts]
 [[('capacity', 100), ('name', u'Main St')]]
 
-# You can also update objects when using a raw save.
+# You can also update objects when using a raw save, in which case False is returned.
 >>> place1.name = "Guido's All New House of Pasta"
 >>> place1.save_base(raw=True)
+False
 
 >>> restaurant.serves_hot_dogs = False
 >>> restaurant.save_base(raw=True)
+False
 
 >>> italian_restaurant.serves_gnocchi = False
 >>> italian_restaurant.save_base(raw=True)
+False
 
 >>> place2.name='Derelict lot'
 >>> place2.save_base(raw=True)
+False
 
 >>> park.capacity = 50
 >>> park.save_base(raw=True)
+False
 
 # No extra parent objects after an update, either.
 >>> Place.objects.all()
@@ -185 +195 @@
 
 >>> italian_restaurant.name = "Lorenzo's Pasta Hut"
 >>> italian_restaurant.save_base(raw=True)
+False
 
 # Note that the name has not changed
 # - name is an attribute of Place, not ItalianRestaurant