Commit 6be20bf6 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.0.X] Fixed #9011 -- Corrected handling of fixture files that contain errors... 

[1.0.X] Fixed #9011 -- Corrected handling of fixture files that contain errors to correctly report the broken fixture name. Thanks to jlrivitti@gmail.com for the report and initial patch.

Merge of [9357] and [9358] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9359 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 697f73f4

django/core/management/commands/loaddata.py

+19 −21
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ class Command(BaseCommand): 
        # Keep a count of the installed objects and fixtures

        fixture_count = 0

        object_count = 0

        objects_per_fixture = []

        models = set()



        humanize = lambda dirname: dirname and "'%s'" % dirname or 'absolute path'
@@ -108,17 +107,17 @@ class Command(BaseCommand): 
                            return

                        else:

                            fixture_count += 1

                            objects_per_fixture.append(0)

                            objects_in_fixture = 0

                            if verbosity > 0:

                                print "Installing %s fixture '%s' from %s." % \

                                    (format, fixture_name, humanize(fixture_dir))

                            try:

                                objects = serializers.deserialize(format, fixture)

                                for obj in objects:

                                    object_count += 1

                                    objects_per_fixture[-1] += 1

                                    objects_in_fixture += 1

                                    models.add(obj.object.__class__)

                                    obj.save()

                                object_count += objects_in_fixture

                                label_found = True

                            except (SystemExit, KeyboardInterrupt):

                                raise
@@ -136,21 +135,20 @@ class Command(BaseCommand): 
                                             (full_path, traceback.format_exc())))

                                return

                            fixture.close()

                    except:

                        if verbosity > 1:

                            print "No %s fixture '%s' in %s." % \

                                (format, fixture_name, humanize(fixture_dir))





        # If any of the fixtures we loaded contain 0 objects, assume that an

                            # If the fixture we loaded contains 0 objects, assume that an

                            # error was encountered during fixture loading.

        if 0 in objects_per_fixture:

                            if objects_in_fixture == 0:

                                sys.stderr.write(

                                    self.style.ERROR("No fixture data found for '%s'. (File format may be invalid.)" %

                                        (fixture_name)))

                                transaction.rollback()

                                transaction.leave_transaction_management()

                                return

                    except:

                        if verbosity > 1:

                            print "No %s fixture '%s' in %s." % \

                                (format, fixture_name, humanize(fixture_dir))



        # If we found even one object in a fixture, we need to reset the

        # database sequences.

tests/regressiontests/fixtures_regress/fixtures/empty.json

0 → 100644
+1 −0
Original line number Diff line number Diff line 
[]
 
 No newline at end of file

tests/regressiontests/fixtures_regress/models.py

+12 −3
Original line number Diff line number Diff line
@@ -113,6 +113,15 @@ No fixture data found for 'bad_fixture2'. (File format may be invalid.) 
>>> management.call_command('loaddata', 'bad_fixture2', verbosity=0)

No fixture data found for 'bad_fixture2'. (File format may be invalid.)



# Loading a fixture file with no data returns an error

>>> management.call_command('loaddata', 'empty', verbosity=0)

No fixture data found for 'empty'. (File format may be invalid.)



# If any of the fixtures contain an error, loading is aborted

# (Regression for #9011 - error message is correct)

>>> management.call_command('loaddata', 'bad_fixture2', 'animal', verbosity=0)

No fixture data found for 'bad_fixture2'. (File format may be invalid.)



>>> sys.stderr = savestderr



###############################################