mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Deborgified the app cache.

Browse Source 
Improved Andrew's hack to create temporary app caches to handle
migrations. Now the main app cache has a "master" flag set to True
(which is a non-default keyword argument, thus unlikely to be used by
mistake). Other app cache instances have "master" set to False.

The only sanctioned way to access the app cache is by importing
django.core.apps.app_cache.

If you were instanciating an app cache and relying on the Borg pattern,
you'll have to refactor your code.
This commit is contained in:
Aymeric Augustin
2013-12-17 17:47:19 +01:00
parent 6e895f9e06
commit 0242c56fd8
12 changed files with 71 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/migrations/test_state.py
View File

@@ -1,4 +1,4 @@
from django.core.apps.cache import BaseAppCache
from django.core.apps.cache import AppCache
from django.db import models
from django.db.migrations.state import ProjectState, ModelState, InvalidBasesError
from django.test import TestCase
@@ -14,7 +14,7 @@ class StateTests(TestCase):
Tests making a ProjectState from an AppCache
"""
new_app_cache = BaseAppCache()
new_app_cache = AppCache()
class Author(models.Model):
name = models.CharField(max_length=255)
@@ -100,15 +100,15 @@ class StateTests(TestCase):
class Meta:
app_label = "migrations"
app_cache = BaseAppCache()
app_cache = AppCache()
class Novel(Book):
class Meta:
app_label = "migrations"
app_cache = BaseAppCache()
app_cache = AppCache()
# First, test rendering individually
app_cache = BaseAppCache()
app_cache = AppCache()
# We shouldn't be able to render yet
ms = ModelState.from_model(Novel)
@@ -123,19 +123,19 @@ class StateTests(TestCase):
class Foo(models.Model):
class Meta:
app_label = "migrations"
app_cache = BaseAppCache()
app_cache = AppCache()
class Bar(models.Model):
class Meta:
app_label = "migrations"
app_cache = BaseAppCache()
app_cache = AppCache()
class FooBar(Foo, Bar):
class Meta:
app_label = "migrations"
app_cache = BaseAppCache()
app_cache = AppCache()
app_cache = BaseAppCache()
app_cache = AppCache()
# We shouldn't be able to render yet
ms = ModelState.from_model(FooBar)
@@ -152,7 +152,7 @@ class StateTests(TestCase):
Tests that the ProjectState render method correctly renders models
to account for inter-model base dependencies.
"""
new_app_cache = BaseAppCache()
new_app_cache = AppCache()
class A(models.Model):
class Meta: