Fixed #20509 - Proper parsing for dumpdata --pks option.

Thanks weipin for the report and Baptiste Mispelon for the patch.
This commit is contained in:
Tim Graham 2013-05-29 13:47:49 -04:00
parent 69f7db153d
commit 59235816bd
3 changed files with 24 additions and 4 deletions

View File

@ -21,8 +21,9 @@ class Command(BaseCommand):
help='Use natural keys if they are available.'), help='Use natural keys if they are available.'),
make_option('-a', '--all', action='store_true', dest='use_base_manager', default=False, make_option('-a', '--all', action='store_true', dest='use_base_manager', default=False,
help="Use Django's base manager to dump all models stored in the database, including those that would otherwise be filtered or modified by a custom manager."), help="Use Django's base manager to dump all models stored in the database, including those that would otherwise be filtered or modified by a custom manager."),
make_option('--pks', dest='primary_keys', action='append', default=[], make_option('--pks', dest='primary_keys', help="Only dump objects with "
help="Only dump objects with given primary keys. Accepts a comma seperated list of keys. This option will only work when you specify one model."), "given primary keys. Accepts a comma seperated list of keys. "
"This option will only work when you specify one model."),
) )
help = ("Output the contents of the database as a fixture of the given " help = ("Output the contents of the database as a fixture of the given "
"format (using each model's default manager unless --all is " "format (using each model's default manager unless --all is "
@ -44,7 +45,7 @@ class Command(BaseCommand):
if pks: if pks:
primary_keys = pks.split(',') primary_keys = pks.split(',')
else: else:
primary_keys = False primary_keys = []
excluded_apps = set() excluded_apps = set()
excluded_models = set() excluded_models = set()

View File

@ -1682,3 +1682,22 @@ class DiffSettings(AdminScriptTestCase):
out, err = self.run_manage(args) out, err = self.run_manage(args)
self.assertNoOutput(err) self.assertNoOutput(err)
self.assertOutput(out, "### STATIC_URL = None") self.assertOutput(out, "### STATIC_URL = None")
class Dumpdata(AdminScriptTestCase):
"""Tests for dumpdata management command."""
def setUp(self):
self.write_settings('settings.py')
def tearDown(self):
self.remove_settings('settings.py')
def test_pks_parsing(self):
"""Regression for #20509
Test would raise an exception rather than printing an error message.
"""
args = ['dumpdata', '--pks=1']
out, err = self.run_manage(args)
self.assertOutput(err, "You can only use --pks option with one model")
self.assertNoOutput(out)

View File

@ -27,7 +27,7 @@ class TestCaseFixtureLoadingTests(TestCase):
class DumpDataAssertMixin(object): class DumpDataAssertMixin(object):
def _dumpdata_assert(self, args, output, format='json', natural_keys=False, def _dumpdata_assert(self, args, output, format='json', natural_keys=False,
use_base_manager=False, exclude_list=[], primary_keys=[]): use_base_manager=False, exclude_list=[], primary_keys=''):
new_io = six.StringIO() new_io = six.StringIO()
management.call_command('dumpdata', *args, **{'format': format, management.call_command('dumpdata', *args, **{'format': format,
'stdout': new_io, 'stdout': new_io,