Changeset 9357

Timestamp:

11/06/08 05:19:13 (8 months ago)

Author:

russellm

Message:

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.

Files:

• django/trunk/django/core/management/commands/loaddata.py (modified) (4 diffs)
• django/trunk/tests/regressiontests/fixtures_regress/models.py (modified) (4 diffs)

django/trunk/django/core/management/commands/loaddata.py

@@ -36 +36 @@
-        fixture_count = 0
-        object_count = 0
-        objects_per_fixture = []
-        models = set()
-
@@ -104 +103 @@
-                        else:
-                            fixture_count += 1
-per_fixture.append(0)
+in_fixture = 0
-                            if verbosity > 0:
-                                print "Installing %s fixture '%s' from %s." % \
@@ -111 +110 @@
-                                objects = serializers.deserialize(format, fixture)
-                                for obj in objects:
-
-
+
-                                    models.add(obj.object.__class__)
-                                    obj.save()
+                                object_count += objects_in_fixture
-                                label_found = True
-                            except (SystemExit, KeyboardInterrupt):
@@ -132 +131 @@
-                                return
-                            fixture.close()
+
+                            # If the fixture we loaded contains 0 objects, assume that an
+                            # error was encountered during fixture loading.
+                            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 any of the fixtures we loaded contain 0 objects, assume that an
-        # error was encountered during fixture loading.
-        if 0 in objects_per_fixture:
-            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
-
-        # If we found even one object in a fixture, we need to reset the

django/trunk/tests/regressiontests/fixtures_regress/models.py

@@ -8 +8 @@
-    latin_name = models.CharField(max_length=150)
-    count = models.IntegerField()
-
+
-    def __unicode__(self):
-        return self.common_name
@@ -57 +57 @@
-    title = models.CharField(max_length=255)
-    channels = models.ManyToManyField(Channel)
-
+
-    class Meta:
-        ordering = ('id',)
@@ -114 +114 @@
-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
-
@@ -124 +133 @@
-
-###############################################
- 
+
-# used to create tables, load data, and then query over that data.
-# To compensate, we close the connection after running loaddata.