Changeset 9527

Timestamp:

11/24/08 14:42:09 (2 months ago)

Author:

jacob

Message:

Fixed #4924: added support for loading compressed fixtures. Thanks to Lars Yencken and Jeremy Dunck.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/core/management/commands/loaddata.py (modified) (3 diffs)
• django/trunk/docs/ref/django-admin.txt (modified) (4 diffs)
• django/trunk/tests/modeltests/fixtures/fixtures/fixture4.json.zip (added)
• django/trunk/tests/modeltests/fixtures/fixtures/fixture5.json.gz (added)
• django/trunk/tests/modeltests/fixtures/fixtures/fixture5.json.zip (added)
• django/trunk/tests/modeltests/fixtures/models.py (modified) (2 diffs)

django/trunk/AUTHORS

@@ -426 +426 @@
-    wojtek
-    Jason Yan <tailofthesun@gmail.com>
+    Lars Yencken <lars.yencken@gmail.com>
-    ye7cakf02@sneakemail.com
-    ymasuda@ethercube.com

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

@@ -4 +4 @@
-import sys
-import os
+import bz2, gzip, zipfile
-
-try:
@@ -52 +53 @@
-            transaction.managed(True)
-
+        class SingleZipReader(zipfile.ZipFile):
+            def __init__(self, *args, **kwargs):
+                zipfile.ZipFile.__init__(self, *args, **kwargs)
+                if settings.DEBUG:
+                    assert len(self.namelist()) == 1, "Zip-compressed fixtures must contain only one file."
+            def read(self):
+                return zipfile.ZipFile.read(self, self.namelist()[0])
+
+        compression_types = {
+            None:   file,
+            'bz2':  bz2.BZ2File,
+            'gz':   gzip.GzipFile,
+            'zip':  SingleZipReader
+        }
+
-        app_fixtures = [os.path.join(os.path.dirname(app.__file__), 'fixtures') for app in get_apps()]
-        for fixture_label in fixture_labels:
-            parts = fixture_label.split('.')
+
+            if len(parts) > 1 and parts[-1] in compression_types:
+                compression_formats = [parts[-1]]
+                parts = parts[:-1]
+            else:
+                compression_formats = compression_types.keys()
+
-            if len(parts) == 1:
-fixture_label
+parts[0]
-                formats = serializers.get_public_serializer_formats()
-            else:
@@ -87 +110 @@
-                label_found = False
-                for format in formats:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                fixture.close()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-                                transaction.rollback()
-                                transaction.leave_transaction_management()
-                                return
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        # If we found even one object in a fixture, we need to reset the

django/trunk/docs/ref/django-admin.txt

@@ -291 +291 @@
-Searches for and loads the contents of the named fixture into the database.
-
+What's a "fixture"?
+~~~~~~~~~~~~~~~~~~~
+
-A *fixture* is a collection of files that contain the serialized contents of
-the database. Each fixture has a unique name, and the files that comprise the
@@ -310 +313 @@
-
-would only load JSON fixtures called ``mydata``. The fixture extension
- serializer (e.g., ``json`` or
-
-
-
+
+:ref:`serializer <serialization-formats>` (e.g., ``json`` or 
+
+s
-for a matching fixture. For example::
-
@@ -320 +323 @@
-would look for any fixture of any fixture type called ``mydata``. If a fixture
-directory contained ``mydata.json``, that fixture would be loaded
-
-
-
-
-
+
-
-The fixtures that are named can include directory components. These
@@ -342 +341 @@
-
-The ``dumpdata`` command can be used to generate input for ``loaddata``.
+
+Compressed fixtures
+~~~~~~~~~~~~~~~~~~~
+
+Fixtures may be compressed in ``zip``, ``gz``, or ``bz2`` format. For example::
+
+    django-admin.py loaddata mydata.json
+
+would look for any of ``mydata.json``, ``mydata.json.zip``,
+``mydata.json.gz``, or ``mydata.json.bz2``.  The first file contained within a
+zip-compressed archive is used.
+
+Note that if two fixtures with the same name but different
+fixture type are discovered (for example, if ``mydata.json`` and
+``mydata.xml.gz`` were found in the same fixture directory), fixture
+installation will be aborted, and any data installed in the call to
+``loaddata`` will be removed from the database.
-
-.. admonition:: MySQL and Fixtures

django/trunk/tests/modeltests/fixtures/models.py

@@ -77 +77 @@
-Multiple fixtures named 'fixture2' in '...fixtures'. Aborting.
-
+# object list is unaffected
->>> Article.objects.all()
-[<Article: Time to reform copyright>, <Article: Poker has no place on ESPN>, <Article: Python program becomes self aware>]
@@ -83 +84 @@
->>> management.call_command('dumpdata', 'fixtures', format='json')
-[{"pk": 3, "model": "fixtures.article", "fields": {"headline": "Time to reform copyright", "pub_date": "2006-06-16 13:00:00"}}, {"pk": 2, "model": "fixtures.article", "fields": {"headline": "Poker has no place on ESPN", "pub_date": "2006-06-16 12:00:00"}}, {"pk": 1, "model": "fixtures.article", "fields": {"headline": "Python program becomes self aware", "pub_date": "2006-06-16 11:00:00"}}]
+
+# Load fixture 4 (compressed), using format discovery
+>>> management.call_command('loaddata', 'fixture4', verbosity=0)
+>>> Article.objects.all()
+[<Article: Django pets kitten>, <Article: Time to reform copyright>, <Article: Poker has no place on ESPN>, <Article: Python program becomes self aware>]
+
+>>> management.call_command('flush', verbosity=0, interactive=False)
+
+# Load fixture 4 (compressed), using format specification
+>>> management.call_command('loaddata', 'fixture4.json', verbosity=0)
+>>> Article.objects.all()
+[<Article: Django pets kitten>, <Article: Python program becomes self aware>]
+
+>>> management.call_command('flush', verbosity=0, interactive=False)
+
+# Load fixture 5 (compressed), using format *and* compression specification
+>>> management.call_command('loaddata', 'fixture5.json.zip', verbosity=0)
+>>> Article.objects.all()
+[<Article: WoW subscribers now outnumber readers>, <Article: Python program becomes self aware>]
+
+>>> management.call_command('flush', verbosity=0, interactive=False)
+
+# Load fixture 5 (compressed), only compression specification
+>>> management.call_command('loaddata', 'fixture5.zip', verbosity=0)
+>>> Article.objects.all()
+[<Article: WoW subscribers now outnumber readers>, <Article: Python program becomes self aware>]
+
+>>> management.call_command('flush', verbosity=0, interactive=False)
+
+# Try to load fixture 5 using format and compression discovery; this will fail
+# because there are two fixture5's in the fixtures directory
+>>> management.call_command('loaddata', 'fixture5', verbosity=0) # doctest: +ELLIPSIS
+Multiple fixtures named 'fixture5' in '...fixtures'. Aborting.
-"""
-