Permalink
Browse files

[soc2010/app-loading] check if there is more than one app with the sa…

…me db_prefix

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/app-loading@13597 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 2f027bf commit 5e17e835a073d489d6325ea540c29a86bb18fc38 @arthurk arthurk committed Aug 16, 2010
Showing with 22 additions and 1 deletion.
  1. +10 −1 django/core/apps.py
  2. +4 −0 tests/appcachetests/model_app/__init__.py
  3. +8 −0 tests/appcachetests/runtests.py
View
@@ -24,7 +24,6 @@ class App(object):
def __init__(self, name):
self.name = name
self.verbose_name = _(name.title())
- self.verbose_name_plural = _(name.title())
self.db_prefix = name
self.errors = []
self.models = []
@@ -97,6 +96,16 @@ def _populate(self):
% app_label)
for model in models.itervalues():
app_instance.models.append(model)
+ # check if there is more than one app with the same
+ # db_prefix attribute
+ for app in self.app_instances:
+ for app_cmp in self.app_instances:
+ if app != app_cmp and \
+ app.db_prefix == app_cmp.db_prefix:
+ raise ImproperlyConfigured(
+ 'The apps "%s" and "%s" have the same '
+ 'db_prefix "%s"'
+ % (app, app_cmp, app.db_prefix))
self.loaded = True
self.unbound_models = {}
finally:
@@ -6,3 +6,7 @@ class MyApp(App):
def __repr__(self):
return '<MyApp: %s>' % self.name
+class MyOtherApp(MyApp):
+ def __init__(self, name):
+ super(MyOtherApp, self).__init__(name)
+ self.db_prefix = 'nomodel_app'
@@ -97,6 +97,14 @@ def test_empty_models(self):
self.assertEqual(cache.get_apps(), [])
self.assertTrue(cache.app_cache_ready())
+ def test_db_prefix_exception(self):
+ """
+ Test that an exception is raised if two app instances
+ have the same db_prefix attribute
+ """
+ settings.INSTALLED_APPS = ('nomodel_app.MyApp', 'model_app.MyOtherApp',)
+ self.assertRaises(ImproperlyConfigured, cache.get_apps)
+
class GetAppTests(AppCacheTestCase):
"""Tests for the get_app function"""

0 comments on commit 5e17e83

Please sign in to comment.