mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 02:09:13 +00:00
Code Issues 32 Releases Wiki Activity

[1.1.X] Fixed #11936 -- Removed deferred models from the list returned by the app_cache. Thanks to ryszard for the report, and clamothe for the initial patch.

Browse Source 
Backport of r11938 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11942 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2009-12-22 11:20:43 +00:00
parent b15d762d7a
commit 7d6213e0aa
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
django/db/models/loading.py
View File

@ -131,19 +131,27 @@ class AppCache(object):
self._populate() self._populate()
return self.app_errors return self.app_errors
def get_models(self, app_mod=None): def get_models(self, app_mod=None, include_deferred=False):
""" """
Given a module containing models, returns a list of the models. Given a module containing models, returns a list of the models.
Otherwise returns a list of all installed models. Otherwise returns a list of all installed models.
By default, models created to satisfy deferred attribute
queries are *not* included in the list of models. However, if
you specify include_deferred, they will be.
""" """
self._populate() self._populate()
if app_mod: if app_mod:
return self.app_models.get(app_mod.__name__.split('.')[-2], SortedDict()).values() app_list = [self.app_models.get(app_mod.__name__.split('.')[-2], SortedDict())]
else: else:
model_list = [] app_list = self.app_models.itervalues()
for app_entry in self.app_models.itervalues(): model_list = []
model_list.extend(app_entry.values()) for app in app_list:
return model_list model_list.extend(
model for model in app.values()
if (not model._deferred or include_deferred)
)
return model_list
def get_model(self, app_label, model_name, seed_cache=True): def get_model(self, app_label, model_name, seed_cache=True):
""" """

6
tests/modeltests/defer/models.py
View File

@ -183,10 +183,4 @@ u"bar"
>>> obj.name = "bb" >>> obj.name = "bb"
>>> obj.save() >>> obj.save()
# Finally, we need to flush the app cache for the defer module.
# Using only/defer creates some artifical entries in the app cache
# that messes up later tests. Purge all entries, just to be sure.
>>> from django.db.models.loading import cache
>>> cache.app_models['defer'] = {}
"""} """}

13
tests/regressiontests/defer_regress/models.py
View File

@ -132,11 +132,14 @@ False
>>> i2._deferred # Item must still be non-deferred >>> i2._deferred # Item must still be non-deferred
False False
# Finally, we need to flush the app cache for the defer module. # Regression for #11936 - loading.get_models should not return deferred models by default.
# Using only/defer creates some artifical entries in the app cache >>> from django.db.models.loading import get_models
# that messes up later tests. Purge all entries, just to be sure. >>> sorted(get_models(models.get_app('defer_regress')), key=lambda obj: obj.__class__.__name__)
>>> from django.db.models.loading import cache [<class 'regressiontests.defer_regress.models.Item'>, <class 'regressiontests.defer_regress.models.RelatedItem'>, <class 'regressiontests.defer_regress.models.Child'>, <class 'regressiontests.defer_regress.models.Leaf'>]
>>> cache.app_models['defer_regress'] = {}
>>> sorted(get_models(models.get_app('defer_regress'), include_deferred=True), key=lambda obj: obj.__class__.__name__)
[<class 'regressiontests.defer_regress.models.Item'>, <class 'regressiontests.defer_regress.models.RelatedItem'>, <class 'regressiontests.defer_regress.models.Child'>, <class 'regressiontests.defer_regress.models.Leaf'>, <class 'regressiontests.defer_regress.models.Item_Deferred_text_value'>, <class 'regressiontests.defer_regress.models.Item_Deferred_name_other_value_text'>, <class 'regressiontests.defer_regress.models.RelatedItem_Deferred_item_id'>, <class 'regressiontests.defer_regress.models.Leaf_Deferred_second_child_value'>, <class 'regressiontests.defer_regress.models.Leaf_Deferred_name_value'>, <class 'regressiontests.defer_regress.models.Item_Deferred_name'>, <class 'regressiontests.defer_regress.models.Item_Deferred_other_value_text_value'>, <class 'regressiontests.defer_regress.models.Leaf_Deferred_value'>]
""" """
} }