mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-07 07:15:35 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #10200 -- Raised CommandError when errors happen in loaddata.

Browse Source
This commit is contained in:
Claude Paroz
2012-06-07 10:31:08 +02:00
parent 4464bbba15
commit 6fd1950a4e
3 changed files with 81 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@ import traceback
from django.conf import settings
from django.core import serializers
from django.core.management.base import BaseCommand
from django.core.management.base import BaseCommand, CommandError
from django.core.management.color import no_style
from django.db import (connections, router, transaction, DEFAULT_DB_ALIAS,
IntegrityError, DatabaseError)
@@ -36,11 +36,10 @@ class Command(BaseCommand):
connection = connections[using]
if not len(fixture_labels):
self.stderr.write(
raise CommandError(
"No database fixture specified. Please provide the path of at "
"least one fixture in the command line."
)
return
verbosity = int(options.get('verbosity'))
show_traceback = options.get('traceback')
@@ -126,13 +125,9 @@ class Command(BaseCommand):
if verbosity >= 2:
self.stdout.write("Loading '%s' fixtures..." % fixture_name)
else:
self.stderr.write(
raise CommandError(
"Problem installing fixture '%s': %s is not a known serialization format." %
(fixture_name, format))
if commit:
transaction.rollback(using=using)
transaction.leave_transaction_management(using=using)
return
if os.path.isabs(fixture_name):
fixture_dirs = [fixture_name]
@@ -167,12 +162,8 @@ class Command(BaseCommand):
else:
try:
if label_found:
self.stderr.write("Multiple fixtures named '%s' in %s. Aborting." %
raise CommandError("Multiple fixtures named '%s' in %s. Aborting." %
(fixture_name, humanize(fixture_dir)))
if commit:
transaction.rollback(using=using)
transaction.leave_transaction_management(using=using)
return
fixture_count += 1
objects_in_fixture = 0
@@ -191,13 +182,13 @@ class Command(BaseCommand):
try:
obj.save(using=using)
except (DatabaseError, IntegrityError) as e:
msg = "Could not load %(app_label)s.%(object_name)s(pk=%(pk)s): %(error_msg)s" % {
e.args = ("Could not load %(app_label)s.%(object_name)s(pk=%(pk)s): %(error_msg)s" % {
'app_label': obj.object._meta.app_label,
'object_name': obj.object._meta.object_name,
'pk': obj.object.pk,
'error_msg': e
}
raise e.__class__, e.__class__(msg), sys.exc_info()[2]
},)
raise
loaded_object_count += loaded_objects_in_fixture
fixture_object_count += objects_in_fixture
@@ -208,13 +199,9 @@ class Command(BaseCommand):
# If the fixture we loaded contains 0 objects, assume that an
# error was encountered during fixture loading.
if objects_in_fixture == 0:
self.stderr.write(
raise CommandError(
"No fixture data found for '%s'. (File format may be invalid.)" %
(fixture_name))
if commit:
transaction.rollback(using=using)
transaction.leave_transaction_management(using=using)
return
# Since we disabled constraint checks, we must manually check for
# any invalid keys that might have been added
@@ -223,19 +210,13 @@ class Command(BaseCommand):
except (SystemExit, KeyboardInterrupt):
raise
except Exception:
except Exception as e:
if commit:
transaction.rollback(using=using)
transaction.leave_transaction_management(using=using)
if show_traceback:
traceback.print_exc()
else:
self.stderr.write(
"Problem installing fixture '%s': %s" %
(full_path, ''.join(traceback.format_exception(sys.exc_type,
sys.exc_value, sys.exc_traceback))))
return
if not isinstance(e, CommandError):
e.args = ("Problem installing fixture '%s': %s" % (full_path, e),)
raise
# If we found even one object in a fixture, we need to reset the
# database sequences.