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

Fixed #10215 -- Ensured that there is parity between enter and leave transaction calls in loaddata when commit=False. The test case for this is the fixtures_regress unittests under MyISAM, which were failing previous to this fix. Thanks to MockSoul for the report. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13978 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-10-02 13:56:09 +00:00
parent 57456c59a6
commit 96c11b29bd
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
django/core/management/commands/loaddata.py
View File

@ -118,8 +118,9 @@ class Command(BaseCommand):
self.stderr.write( self.stderr.write(
self.style.ERROR("Problem installing fixture '%s': %s is not a known serialization format.\n" % self.style.ERROR("Problem installing fixture '%s': %s is not a known serialization format.\n" %
(fixture_name, format))) (fixture_name, format)))
transaction.rollback(using=using) if commit:
transaction.leave_transaction_management(using=using) transaction.rollback(using=using)
transaction.leave_transaction_management(using=using)
return return
if os.path.isabs(fixture_name): if os.path.isabs(fixture_name):
@ -152,8 +153,9 @@ class Command(BaseCommand):
fixture.close() fixture.close()
self.stderr.write(self.style.ERROR("Multiple fixtures named '%s' in %s. Aborting.\n" % self.stderr.write(self.style.ERROR("Multiple fixtures named '%s' in %s. Aborting.\n" %
(fixture_name, humanize(fixture_dir)))) (fixture_name, humanize(fixture_dir))))
transaction.rollback(using=using) if commit:
transaction.leave_transaction_management(using=using) transaction.rollback(using=using)
transaction.leave_transaction_management(using=using)
return return
else: else:
fixture_count += 1 fixture_count += 1
@ -178,8 +180,9 @@ class Command(BaseCommand):
except Exception: except Exception:
import traceback import traceback
fixture.close() fixture.close()
transaction.rollback(using=using) if commit:
transaction.leave_transaction_management(using=using) transaction.rollback(using=using)
transaction.leave_transaction_management(using=using)
if show_traceback: if show_traceback:
traceback.print_exc() traceback.print_exc()
else: else:
@ -196,8 +199,9 @@ class Command(BaseCommand):
self.stderr.write( self.stderr.write(
self.style.ERROR("No fixture data found for '%s'. (File format may be invalid.)\n" % self.style.ERROR("No fixture data found for '%s'. (File format may be invalid.)\n" %
(fixture_name))) (fixture_name)))
transaction.rollback(using=using) if commit:
transaction.leave_transaction_management(using=using) transaction.rollback(using=using)
transaction.leave_transaction_management(using=using)
return return
except Exception, e: except Exception, e: