p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refs #32317 -- Cleaned up try/except blocks in loaddata command. 

This moves code unable to trigger relevant exceptions outside of
try/except blocks, and changes 'objects' to 'objects_in_fixture'
which is equal to the length of 'objects'.
This commit is contained in:
William Schwartz 2020-12-30 10:28:48 -06:00 committed by Mariusz Felisiak
parent 530f58caaa
commit 1e655d35ad
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,8 +117,8 @@ class Command(BaseCommand):
else: else:
return return
with connection.constraint_checks_disabled():
self.objs_with_deferred_fields = [] self.objs_with_deferred_fields = []
with connection.constraint_checks_disabled():
for fixture_label in fixture_labels: for fixture_label in fixture_labels:
self.load_label(fixture_label) self.load_label(fixture_label)
for obj in self.objs_with_deferred_fields: for obj in self.objs_with_deferred_fields:
@ -163,7 +163,6 @@ class Command(BaseCommand):
_, ser_fmt, cmp_fmt = self.parse_name(os.path.basename(fixture_file)) _, ser_fmt, cmp_fmt = self.parse_name(os.path.basename(fixture_file))
open_method, mode = self.compression_formats[cmp_fmt] open_method, mode = self.compression_formats[cmp_fmt]
fixture = open_method(fixture_file, mode) fixture = open_method(fixture_file, mode)
try:
self.fixture_count += 1 self.fixture_count += 1
objects_in_fixture = 0 objects_in_fixture = 0
loaded_objects_in_fixture = 0 loaded_objects_in_fixture = 0
@ -172,7 +171,7 @@ class Command(BaseCommand):
"Installing %s fixture '%s' from %s." "Installing %s fixture '%s' from %s."
% (ser_fmt, fixture_name, humanize(fixture_dir)) % (ser_fmt, fixture_name, humanize(fixture_dir))
) )
try:
objects = serializers.deserialize( objects = serializers.deserialize(
ser_fmt, fixture, using=self.using, ignorenonexistent=self.ignore, ser_fmt, fixture, using=self.using, ignorenonexistent=self.ignore,
handle_forward_references=True, handle_forward_references=True,
@ -188,11 +187,6 @@ class Command(BaseCommand):
self.models.add(obj.object.__class__) self.models.add(obj.object.__class__)
try: try:
obj.save(using=self.using) obj.save(using=self.using)
if show_progress:
self.stdout.write(
'\rProcessed %i object(s).' % loaded_objects_in_fixture,
ending=''
)
# psycopg2 raises ValueError if data contains NUL chars. # psycopg2 raises ValueError if data contains NUL chars.
except (DatabaseError, IntegrityError, ValueError) as e: except (DatabaseError, IntegrityError, ValueError) as e:
e.args = ("Could not load %(object_label)s(pk=%(pk)s): %(error_msg)s" % { e.args = ("Could not load %(object_label)s(pk=%(pk)s): %(error_msg)s" % {
@ -201,12 +195,13 @@ class Command(BaseCommand):
'error_msg': e, 'error_msg': e,
},) },)
raise raise
if show_progress:
self.stdout.write(
'\rProcessed %i object(s).' % loaded_objects_in_fixture,
ending=''
)
if obj.deferred_fields: if obj.deferred_fields:
self.objs_with_deferred_fields.append(obj) self.objs_with_deferred_fields.append(obj)
if objects and show_progress:
self.stdout.write() # Add a newline after progress indicator.
self.loaded_object_count += loaded_objects_in_fixture
self.fixture_object_count += objects_in_fixture
except Exception as e: except Exception as e:
if not isinstance(e, CommandError): if not isinstance(e, CommandError):
e.args = ("Problem installing fixture '%s': %s" % (fixture_file, e),) e.args = ("Problem installing fixture '%s': %s" % (fixture_file, e),)
@ -214,6 +209,10 @@ class Command(BaseCommand):
finally: finally:
fixture.close() fixture.close()
if objects_in_fixture and show_progress:
self.stdout.write() # Add a newline after progress indicator.
self.loaded_object_count += loaded_objects_in_fixture
self.fixture_object_count += objects_in_fixture
# Warn if the fixture we loaded contains 0 objects. # Warn if the fixture we loaded contains 0 objects.
if objects_in_fixture == 0: if objects_in_fixture == 0:
warnings.warn( warnings.warn(