Ticket #12572: 12572_syncdb.diff

django/core/management/commands/syncdb.py

@@ -2 +2 @@
 import sys
 
 from django.conf import settings
-from django.core.management.base import NoArgsCommand
+from django.core.management.base import BaseCommand, CommandError
 from django.core.management.color import no_style
 from django.core.management.sql import custom_sql_for_model, emit_post_sync_signal
 from django.db import connections, transaction, models, DEFAULT_DB_ALIAS
 from django.utils.importlib import import_module
+from django.core.exceptions import ImproperlyConfigured
 
 
-class Command(NoArgsCommand):
-    option_list = NoArgsCommand.option_list + (
+class Command(BaseCommand):
+    option_list = BaseCommand.option_list + (
         make_option('--noinput', action='store_false', dest='interactive', default=True,
             help='Tells Django to NOT prompt the user for input of any kind.'),
         make_option('--database', action='store', dest='database',
@@ -19 +20 @@
         make_option('-e', '--exclude', dest='exclude',action='append', default=[],
             help='App to exclude (use multiple --exclude to exclude multiple apps).'),
     )
-    help = "Create the database tables for all apps in INSTALLED_APPS whose tables haven't already been created."
+    help = ("Create the database tables for the apps in argument list or for all "
+            "apps in INSTALLED_APPS if no app names given whose tables haven't already been created.")
+    args = '[appname ...]'
 
-    def handle_noargs(self, **options):
+    def handle(self, *app_labels, **options):
 
         verbosity = int(options.get('verbosity', 1))
         interactive = options.get('interactive')
@@ -32 +35 @@
 
         # Import the 'management' module within each installed app, to register
         # dispatcher events.
-        for app_name in settings.INSTALLED_APPS:
+        for app_name in app_labels or settings.INSTALLED_APPS:
             try:
                 import_module('.management', app_name)
             except ImportError, exc:
@@ -59 +62 @@
         created_models = set()
         pending_references = {}
 
-        excluded_apps = set(models.get_app(app_label) for app_label in exclude)
-        included_apps = set(app for app in models.get_apps() if app not in excluded_apps)
+        try:
+            excluded_apps = set(models.get_app(app_label) for app_label in exclude)
+        except ImproperlyConfigured, e:
+            raise CommandError(e)
 
+        if len(app_labels) == 0:
+            included_apps = set(app for app in models.get_apps() if app not in excluded_apps)
+        else:
+            try:
+                included_apps = set(models.get_app(app_label) for app_label in app_labels if not app_label in exclude)
+            except ImproperlyConfigured, e:
+                raise CommandError(e)
+
         # Create the tables for each model
         for app in included_apps:
             app_name = app.__name__.split('.')[-2]