Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #12712 -- Corrected a problem with synchronizing that prevented…

… m2m tables from being created under certain circumstances. Thanks to IonelMaries for the report, and Alex Gaynor for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12597 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 126ca330e230034081182ec8a4bf1f47260b6cb9 1 parent e488c1d
@freakboy3742 freakboy3742 authored
Showing with 10 additions and 5 deletions.
  1. +10 −5 django/core/management/commands/syncdb.py
View
15 django/core/management/commands/syncdb.py
@@ -63,6 +63,16 @@ def handle_noargs(self, **options):
if router.allow_syncdb(db, m)])
for app in models.get_apps()
)
+ def model_installed(model):
+ opts = model._meta
+ converter = connection.introspection.table_name_converter
+ return not ((converter(opts.db_table) in tables) or
+ (opts.auto_created and converter(opts.auto_created._meta.db_table) in tables))
+
+ manifest = dict(
+ (app_name, filter(model_installed, model_list))
+ for app_name, model_list in manifest.iteritems()
+ )
# Create the tables for each model
for app_name, model_list in manifest.items():
@@ -70,11 +80,6 @@ def handle_noargs(self, **options):
# Create the model's database table, if it doesn't already exist.
if verbosity >= 2:
print "Processing %s.%s model" % (app_name, model._meta.object_name)
- opts = model._meta
- if (connection.introspection.table_name_converter(opts.db_table) in tables or
- (opts.auto_created and
- connection.introspection.table_name_converter(opts.auto_created._meta.db_table) in tables)):
- continue
sql, references = connection.creation.sql_create_model(model, self.style, seen_models)
seen_models.add(model)
created_models.add(model)
Please sign in to comment.
Something went wrong with that request. Please try again.