innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #12286 -- Corrected order of table creation in syncdb so that it doesn't cause problems with proxied models. Thanks to everyone that helped to narrow down the problem. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13028 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-04-27 11:51:43 +00:00
parent 215269b84f
commit ffe79b0979
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/core/management/commands/syncdb.py
View File

@ -6,6 +6,7 @@ from django.core.management.base import NoArgsCommand
from django.core.management.color import no_style from django.core.management.color import no_style
from django.core.management.sql import custom_sql_for_model, emit_post_sync_signal from django.core.management.sql import custom_sql_for_model, emit_post_sync_signal
from django.db import connections, router, transaction, models, DEFAULT_DB_ALIAS from django.db import connections, router, transaction, models, DEFAULT_DB_ALIAS
from django.utils.datastructures import SortedDict
from django.utils.importlib import import_module from django.utils.importlib import import_module
@ -57,21 +58,21 @@ class Command(NoArgsCommand):
pending_references = {} pending_references = {}
# Build the manifest of apps and models that are to be synchronized # Build the manifest of apps and models that are to be synchronized
manifest = dict( all_models = [
(app.__name__.split('.')[-2], (app.__name__.split('.')[-2],
[m for m in models.get_models(app, include_auto_created=True) [m for m in models.get_models(app, include_auto_created=True)
if router.allow_syncdb(db, m)]) if router.allow_syncdb(db, m)])
for app in models.get_apps() for app in models.get_apps()
) ]
def model_installed(model): def model_installed(model):
opts = model._meta opts = model._meta
converter = connection.introspection.table_name_converter converter = connection.introspection.table_name_converter
return not ((converter(opts.db_table) in tables) or return not ((converter(opts.db_table) in tables) or
(opts.auto_created and converter(opts.auto_created._meta.db_table) in tables)) (opts.auto_created and converter(opts.auto_created._meta.db_table) in tables))
manifest = dict( manifest = SortedDict(
(app_name, filter(model_installed, model_list)) (app_name, filter(model_installed, model_list))
for app_name, model_list in manifest.iteritems() for app_name, model_list in all_models
) )
# Create the tables for each model # Create the tables for each model