diff options
| author | mieciu <przemyslaw.hejman@gmail.com> | 2016-06-02 14:03:03 -0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-06-03 12:42:41 -0400 |
| commit | 9a204fc8a52d79942325ed984d48e5aef5b64d21 (patch) | |
| tree | 4015078c29cbaec05cebafd372d7dfe9f73cb4b9 /django | |
| parent | 521772ff0779ced13f94a6ebcd96740a9eafbb1d (diff) | |
[1.10.x] Fixed #26698 -- Fixed PostgreSQL dbshell crash on an empty database name.
Backport of 19ff506878071ac93de684fe01328707e75e2b3a from master
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/backends/postgresql/client.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/django/db/backends/postgresql/client.py b/django/db/backends/postgresql/client.py index 5e3e288301..1b4b884c60 100644 --- a/django/db/backends/postgresql/client.py +++ b/django/db/backends/postgresql/client.py @@ -17,14 +17,14 @@ class DatabaseClient(BaseDatabaseClient): executable_name = 'psql' @classmethod - def runshell_db(cls, settings_dict): + def runshell_db(cls, conn_params): args = [cls.executable_name] - host = settings_dict.get('HOST', '') - port = settings_dict.get('PORT', '') - name = settings_dict.get('NAME', '') - user = settings_dict.get('USER', '') - passwd = settings_dict.get('PASSWORD', '') + host = conn_params.get('host', '') + port = conn_params.get('port', '') + dbname = conn_params.get('database', '') + user = conn_params.get('user', '') + passwd = conn_params.get('password', '') if user: args += ['-U', user] @@ -32,7 +32,7 @@ class DatabaseClient(BaseDatabaseClient): args += ['-h', host] if port: args += ['-p', str(port)] - args += [name] + args += [dbname] temp_pgpass = None try: @@ -43,7 +43,7 @@ class DatabaseClient(BaseDatabaseClient): print_( _escape_pgpass(host) or '*', str(port) or '*', - _escape_pgpass(name) or '*', + _escape_pgpass(dbname) or '*', _escape_pgpass(user) or '*', _escape_pgpass(passwd), file=temp_pgpass, @@ -63,4 +63,4 @@ class DatabaseClient(BaseDatabaseClient): del os.environ['PGPASSFILE'] def runshell(self): - DatabaseClient.runshell_db(self.connection.settings_dict) + DatabaseClient.runshell_db(self.connection.get_connection_params()) |