adunstan · adunstan · commit b7a9e3ceb4f4 · 2005-11-17T23:42:26.000Z
make psql honor explicit database parameter in -l mode, in case "postgres" database is missing - per complaint from Philip Yarra.
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
@@ -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 &&

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