From c1ed21fa9ee5f64bcf6f70fa30580989bd579a91 Mon Sep 17 00:00:00 2001 From: Andrew Godwin Date: Fri, 26 Jul 2013 16:39:44 +0100 Subject: [PATCH] Use new transaction API in syncdb section of migrate --- django/core/management/commands/migrate.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/django/core/management/commands/migrate.py b/django/core/management/commands/migrate.py index d9fbb846ac..882ebde073 100644 --- a/django/core/management/commands/migrate.py +++ b/django/core/management/commands/migrate.py @@ -12,7 +12,7 @@ from django.db.migrations.executor import MigrationExecutor from django.db.migrations.loader import AmbiguityError from django.utils.datastructures import SortedDict from django.utils.importlib import import_module -from django.utils.module_loading import module_has_submodule, import_by_path +from django.utils.module_loading import module_has_submodule class Command(BaseCommand): @@ -162,7 +162,7 @@ class Command(BaseCommand): # Create the tables for each model if self.verbosity >= 1: self.stdout.write(" Creating tables...\n") - with transaction.commit_on_success_unless_managed(using=connection.alias): + with transaction.atomic(using=connection.alias, savepoint=False): for app_name, model_list in manifest.items(): for model in model_list: # Create the model's database table, if it doesn't already exist. @@ -181,6 +181,10 @@ class Command(BaseCommand): for statement in sql: cursor.execute(statement) tables.append(connection.introspection.table_name_converter(model._meta.db_table)) + + # We force a commit here, as that was the previous behaviour. + # If you can prove we don't need this, remove it. + transaction.set_dirty(using=connection.alias) # Send the post_syncdb signal, so individual apps can do whatever they need # to do at this point.