Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #23136 -- Added a message when sqlclear does nothing

  • Loading branch information...
commit 3e241313a4cea5dbf53068181408a7c34f00c9ca 1 parent 5853c87
Gabriel Muñumel gmunumel authored timgraham committed
2  django/core/management/sql.py
View
@@ -113,6 +113,8 @@ def sql_delete(app_config, style, connection, close_connection=True):
cursor.close()
connection.close()
+ if not output:
+ output.append('-- App creates no tables in the database. Nothing to do.')
return output[::-1] # Reverse it, to deal with table dependencies.
10 tests/admin_scripts/tests.py
View
@@ -297,7 +297,8 @@ class DjangoAdminFullPathDefaultSettings(AdminScriptTestCase):
contains the test application specified using a full path.
"""
def setUp(self):
- self.write_settings('settings.py', ['django.contrib.auth', 'django.contrib.contenttypes', 'admin_scripts'])
+ self.write_settings('settings.py', ['django.contrib.auth', 'django.contrib.contenttypes',
+ 'admin_scripts', 'admin_scripts.complex_app'])
def tearDown(self):
self.remove_settings('settings.py')
@@ -316,6 +317,13 @@ def test_builtin_with_settings(self):
self.assertNoOutput(err)
self.assertOutput(out, 'CREATE TABLE')
+ def test_sqlclear_builtin_with_settings(self):
+ "fulldefault: django-admin builtin commands succeed if a setting file is provided"
+ args = ['sqlclear', '--settings=test_project.settings', 'complex_app']
+ out, err = self.run_django_admin(args)
+ self.assertNoOutput(err)
+ self.assertOutput(out, '-- App creates no tables in the database. Nothing to do.')
+
def test_builtin_with_environment(self):
"fulldefault: django-admin builtin commands succeed if the environment contains settings"
args = ['sqlall', 'admin_scripts']
5 tests/commands_sql/tests.py
View
@@ -73,7 +73,10 @@ def test_router_honored(self):
for sql_command in (sql_all, sql_create, sql_delete, sql_indexes, sql_destroy_indexes):
if sql_command is sql_delete:
output = sql_command(app_config, no_style(), connections[DEFAULT_DB_ALIAS], close_connection=False)
+ # "App creates no tables in the database. Nothing to do."
+ expected_output = 1
else:
output = sql_command(app_config, no_style(), connections[DEFAULT_DB_ALIAS])
- self.assertEqual(len(output), 0,
+ expected_output = 0
+ self.assertEqual(len(output), expected_output,
"%s command is not honoring routers" % sql_command.__name__)
Please sign in to comment.
Something went wrong with that request. Please try again.