diff options
| -rw-r--r-- | django/core/management/commands/dbshell.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/django/core/management/commands/dbshell.py b/django/core/management/commands/dbshell.py index 18faa6a130..688403f023 100644 --- a/django/core/management/commands/dbshell.py +++ b/django/core/management/commands/dbshell.py @@ -1,4 +1,4 @@ -from django.core.management.base import NoArgsCommand +from django.core.management.base import NoArgsCommand, CommandError class Command(NoArgsCommand): help = "Runs the command-line client for the current DATABASE_ENGINE." @@ -7,4 +7,12 @@ class Command(NoArgsCommand): def handle_noargs(self, **options): from django.db import connection - connection.client.runshell() + try: + connection.client.runshell() + except OSError: + # Note that we're assuming OSError means that the client program + # isn't installed. There's a possibility OSError would be raised + # for some other reason, in which case this error message would be + # inaccurate. Still, this message catches the common case. + raise CommandError('You appear not to have the %r program installed or on your path.' % \ + connection.client.executable_name) |