make psql honor explicit database parameter in -l mode, in case "postgres" database is missing - per complaint from Philip Yarra.

This commit is contained in:
Andrew Dunstan 2005-11-17 23:42:26 +00:00
parent cecb607559
commit b7a9e3ceb4
1 changed files with 3 additions and 2 deletions

View File

@ -3,7 +3,7 @@
*
* Copyright (c) 2000-2005, PostgreSQL Global Development Group
*
* $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.126 2005/10/27 13:34:47 momjian Exp $
* $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.127 2005/11/17 23:42:26 adunstan Exp $
*/
#include "postgres_fe.h"
@ -206,7 +206,8 @@ main(int argc, char *argv[])
{
need_pass = false;
pset.db = PQsetdbLogin(options.host, options.port, NULL, NULL,
options.action == ACT_LIST_DB ? "postgres" : options.dbname,
options.action == ACT_LIST_DB && options.dbname == NULL ?
"postgres" : options.dbname,
username, password);
if (PQstatus(pset.db) == CONNECTION_BAD &&