summaryrefslogtreecommitdiff
path: root/django/core
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2009-07-27 14:32:30 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2009-07-27 14:32:30 +0000
commit3412860f89a1f72257037c19c06beebc92dd7e06 (patch)
tree2f2c7dc89ad7e68c539cf1d360cde8a10275094b /django/core
parente00150af15f35b68d30fc1f7970384d10d1d6ff1 (diff)
Fixed #11428 -- Ensured that SQL generating commands and dumpdata don't include proxy models in their output. Thanks to Anssi Kaariainen for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11343 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/core')
-rw-r--r--django/core/management/commands/dumpdata.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/core/management/commands/dumpdata.py b/django/core/management/commands/dumpdata.py
index 9172d938d2..7e05b89160 100644
--- a/django/core/management/commands/dumpdata.py
+++ b/django/core/management/commands/dumpdata.py
@@ -73,7 +73,8 @@ class Command(BaseCommand):
model_list = get_models(app)
for model in model_list:
- objects.extend(model._default_manager.all())
+ if not model._meta.proxy:
+ objects.extend(model._default_manager.all())
try:
return serializers.serialize(format, objects, indent=indent)