diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2009-03-15 03:45:32 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2009-03-15 03:45:32 +0000 |
| commit | 97321c7645f200333bc43ac2f4a22d78dd4154ea (patch) | |
| tree | a579968ea9ebbca4b53a6056f52bfa9f3cfb3a26 /tests/regressiontests | |
| parent | 0eac35ce119f108d2ffaeea745101cc3c4a85b98 (diff) | |
[1.0.X] Use plain model.Manager, or suitable proxy, for model saving.
We can't use the default manager in Model.save_base(), since we need to
retrieve existing objects which might be filtered out by that manager. We now
always use a plain Manager instance at that point (or something that can
replace it, such as a GeoManager), making all existing rows in the
database visible to the saving code.
The logic for detecting a "suitable replacement" plain base is the same as for
related fields: if the use_for_related_fields is set on the manager subclass,
we can use it. The general requirement here is that we want a base class that
returns the appropriate QuerySet subclass, but does not restrict the rows
returned.
Fixed #8990, #9527.
Refs #2698 (which is not fixed by this change, but it's the first part of a
larger change to fix that bug.)
Backport of r10056 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10059 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests')
| -rw-r--r-- | tests/regressiontests/custom_managers_regress/__init__.py | 0 | ||||
| -rw-r--r-- | tests/regressiontests/custom_managers_regress/models.py | 38 |
2 files changed, 38 insertions, 0 deletions
diff --git a/tests/regressiontests/custom_managers_regress/__init__.py b/tests/regressiontests/custom_managers_regress/__init__.py new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/regressiontests/custom_managers_regress/__init__.py diff --git a/tests/regressiontests/custom_managers_regress/models.py b/tests/regressiontests/custom_managers_regress/models.py new file mode 100644 index 0000000000..67fed84447 --- /dev/null +++ b/tests/regressiontests/custom_managers_regress/models.py @@ -0,0 +1,38 @@ +""" +Regression tests for custom manager classes. +""" + +from django.db import models + +class RestrictedManager(models.Manager): + """ + A manager that filters out non-public instances. + """ + def get_query_set(self): + return super(RestrictedManager, self).get_query_set().filter(is_public=True) + +class RestrictedClass(models.Model): + name = models.CharField(max_length=50) + is_public = models.BooleanField(default=False) + + objects = RestrictedManager() + plain_manager = models.Manager() + + def __unicode__(self): + return self.name + +__test__ = {"tests": """ +Even though the default manager filters out some records, we must still be able +to save (particularly, save by updating existing records) those filtered +instances. This is a regression test for #FIXME. +>>> obj = RestrictedClass.objects.create(name="hidden") +>>> obj.name = "still hidden" +>>> obj.save() + +# If the hidden object wasn't seen during the save process, there would now be +# two objects in the database. +>>> RestrictedClass.plain_manager.count() +1 + +""" +} |
