blinkster: comparison web/lib/django/core/management/commands/loaddata.py

equal deleted inserted replaced

-:b758351d191f
+:cc9b7e14412b
 import os
 import gzip
 import zipfile
 from optparse import make_option
+from django.conf import settings
+from django.core import serializers
 from django.core.management.base import BaseCommand
 from django.core.management.color import no_style
+from django.db import connections, router, transaction, DEFAULT_DB_ALIAS
-try:
+from django.db.models import get_apps
-set
+from django.utils.itercompat import product
-except NameError:
-from sets import Set as set   # Python 2.3 fallback
 try:
 import bz2
 has_bz2 = True
 except ImportError:
 class Command(BaseCommand):
 help = 'Installs the named fixture(s) in the database.'
 args = "fixture [fixture ...]"
+option_list = BaseCommand.option_list + (
+make_option('--database', action='store', dest='database',
+default=DEFAULT_DB_ALIAS, help='Nominates a specific database to load '
+'fixtures into. Defaults to the "default" database.'),
+)
 def handle(self, *fixture_labels, **options):
-from django.db.models import get_apps
+using = options.get('database', DEFAULT_DB_ALIAS)
-from django.core import serializers
-from django.db import connection, transaction
+connection = connections[using]
-from django.conf import settings
 self.style = no_style()
 verbosity = int(options.get('verbosity', 1))
 show_traceback = options.get('traceback', False)
 cursor = connection.cursor()
 # Start transaction management. All fixtures are installed in a
 # single transaction to ensure that all references are resolved.
 if commit:
-transaction.commit_unless_managed()
+transaction.commit_unless_managed(using=using)
-transaction.enter_transaction_management()
+transaction.enter_transaction_management(using=using)
-transaction.managed(True)
+transaction.managed(True, using=using)
 class SingleZipReader(zipfile.ZipFile):
 def __init__(self, *args, **kwargs):
 zipfile.ZipFile.__init__(self, *args, **kwargs)
 if settings.DEBUG:
 'zip':  SingleZipReader
 }
 if has_bz2:
 compression_types['bz2'] = bz2.BZ2File
-app_fixtures = [os.path.join(os.path.dirname(app.__file__), 'fixtures') for app in get_apps()]
+app_module_paths = []
+for app in get_apps():
+if hasattr(app, '__path__'):
+# It's a 'models/' subpackage
+for path in app.__path__:
+app_module_paths.append(path)
+else:
+# It's a models.py module
+app_module_paths.append(app.__file__)
+app_fixtures = [os.path.join(os.path.dirname(path), 'fixtures') for path in app_module_paths]
 for fixture_label in fixture_labels:
 parts = fixture_label.split('.')
 if len(parts) > 1 and parts[-1] in compression_types:
 compression_formats = [parts[-1]]
 print "Loading '%s' fixtures..." % fixture_name
 else:
 sys.stderr.write(
 self.style.ERROR("Problem installing fixture '%s': %s is not a known serialization format." %
 (fixture_name, format)))
-transaction.rollback()
+transaction.rollback(using=using)
-transaction.leave_transaction_management()
+transaction.leave_transaction_management(using=using)
 return
 if os.path.isabs(fixture_name):
 fixture_dirs = [fixture_name]
 else:
 for fixture_dir in fixture_dirs:
 if verbosity > 1:
 print "Checking %s for fixtures..." % humanize(fixture_dir)
 label_found = False
-for format in formats:
+for combo in product([using, None], formats, compression_formats):
-for compression_format in compression_formats:
+database, format, compression_format = combo
-if compression_format:
+file_name = '.'.join(
-file_name = '.'.join([fixture_name, format,
+p for p in [
-compression_format])
+fixture_name, database, format, compression_format
-else:
+]
-file_name = '.'.join([fixture_name, format])
+if p
+)
-if verbosity > 1:
-print "Trying %s for %s fixture '%s'..." % \
+if verbosity > 1:
-(humanize(fixture_dir), file_name, fixture_name)
+print "Trying %s for %s fixture '%s'..." % \
-full_path = os.path.join(fixture_dir, file_name)
+(humanize(fixture_dir), file_name, fixture_name)
-open_method = compression_types[compression_format]
+full_path = os.path.join(fixture_dir, file_name)
-try:
+open_method = compression_types[compression_format]
-fixture = open_method(full_path, 'r')
+try:
-if label_found:
+fixture = open_method(full_path, 'r')
-fixture.close()
+if label_found:
-print self.style.ERROR("Multiple fixtures named '%s' in %s. Aborting." %
+fixture.close()
-(fixture_name, humanize(fixture_dir)))
+print self.style.ERROR("Multiple fixtures named '%s' in %s. Aborting." %
-transaction.rollback()
+(fixture_name, humanize(fixture_dir)))
-transaction.leave_transaction_management()
+transaction.rollback(using=using)
-return
+transaction.leave_transaction_management(using=using)
-else:
+return
-fixture_count += 1
+else:
-objects_in_fixture = 0
+fixture_count += 1
-if verbosity > 0:
+objects_in_fixture = 0
-print "Installing %s fixture '%s' from %s." % \
+if verbosity > 0:
-(format, fixture_name, humanize(fixture_dir))
+print "Installing %s fixture '%s' from %s." % \
-try:
+(format, fixture_name, humanize(fixture_dir))
-objects = serializers.deserialize(format, fixture)
+try:
-for obj in objects:
+objects = serializers.deserialize(format, fixture, using=using)
+for obj in objects:
+if router.allow_syncdb(using, obj.object.__class__):
 objects_in_fixture += 1
 models.add(obj.object.__class__)
-obj.save()
+obj.save(using=using)
 object_count += objects_in_fixture
 label_found = True
 except (SystemExit, KeyboardInterrupt):
 raise
 except Exception:
 import traceback
-fixture.close()
-transaction.rollback()
-transaction.leave_transaction_management()
-if show_traceback:
-traceback.print_exc()
-else:
-sys.stderr.write(
-self.style.ERROR("Problem installing fixture '%s': %s\n" %
-(full_path, ''.join(traceback.format_exception(sys.exc_type,
-sys.exc_value, sys.exc_traceback)))))
-return
 fixture.close()
+transaction.rollback(using=using)
-# If the fixture we loaded contains 0 objects, assume that an
+transaction.leave_transaction_management(using=using)
-# error was encountered during fixture loading.
+if show_traceback:
-if objects_in_fixture == 0:
+traceback.print_exc()
+else:
 sys.stderr.write(
-self.style.ERROR("No fixture data found for '%s'. (File format may be invalid.)" %
+self.style.ERROR("Problem installing fixture '%s': %s\n" %
-(fixture_name)))
+(full_path, ''.join(traceback.format_exception(sys.exc_type,
-transaction.rollback()
+sys.exc_value, sys.exc_traceback)))))
-transaction.leave_transaction_management()
+return
-return
+fixture.close()
-except Exception, e:
+# If the fixture we loaded contains 0 objects, assume that an
-if verbosity > 1:
+# error was encountered during fixture loading.
-print "No %s fixture '%s' in %s." % \
+if objects_in_fixture == 0:
-(format, fixture_name, humanize(fixture_dir))
+sys.stderr.write(
+self.style.ERROR("No fixture data found for '%s'. (File format may be invalid.)" %
+(fixture_name)))
+transaction.rollback(using=using)
+transaction.leave_transaction_management(using=using)
+return
+except Exception, e:
+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.
 if object_count > 0:
 sequence_sql = connection.ops.sequence_reset_sql(self.style, models)
 print "Resetting sequences"
 for line in sequence_sql:
 cursor.execute(line)
 if commit:
-transaction.commit()
+transaction.commit(using=using)
-transaction.leave_transaction_management()
+transaction.leave_transaction_management(using=using)
 if object_count == 0:
-if verbosity > 1:
+if verbosity > 0:
 print "No fixtures found."
 else:
 if verbosity > 0:
 print "Installed %d object(s) from %d fixture(s)" % (object_count, fixture_count)

changeset 29	cc9b7e14412b
parent 0	0d40e90630ef