Ticket #5610: dumpdata-improvements.diff

django/core/management/commands/dumpdata.py

@@ -13 +13 @@
     args = '[appname ...]'
 
     def handle(self, *app_labels, **options):
-        from django.db.models import get_app, get_apps, get_models
+        from django.db.models import get_app, get_apps, get_models, get_model
         from django.core import serializers
 
         format = options.get('format', 'json')
         indent = options.get('indent', None)
-
+        
         if len(app_labels) == 0:
             app_list = get_apps()
         else:
-            app_list = [get_app(app_label) for app_label in app_labels]
+            app_list = []
+            model_list = []
+            for app_label in app_labels:
+                app_model_label = app_label.split('.')
+                if len(app_model_label) <= 1:
+                    app_list.append(get_app(app_label))
+                else:
+                    model_list.append(get_model(app_model_label[0], app_model_label[1]))
 
         # Check that the serialization format exists; this is a shortcut to
         # avoid collating all the objects and _then_ failing.
@@ -35 +42 @@
         for app in app_list:
             for model in get_models(app):
                 objects.extend(model.objects.all())
+                
+        for model in model_list:
+            objects.extend(model.objects.all())
+
         try:
             return serializers.serialize(format, objects, indent=indent)
         except Exception, e: