From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 18 Jul 2008 17:19:55 +0000 (+0000)
Subject: In psql, run .psqlrc _after_ printing warnings and banner.
X-Git-Tag: REL8_4_BETA1~1146
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25c9de4d844ff248e0dd0617ca39673f53b6e19b;p=postgresql

In psql, run .psqlrc _after_ printing warnings and banner.
---

diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 8f249e9057..bb82dfb5c4 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2008, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.149 2008/07/01 00:08:18 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.150 2008/07/18 17:19:55 momjian Exp $
  */
 #include "postgres_fe.h"
 
@@ -281,12 +281,14 @@ main(int argc, char *argv[])
 	 */
 	else
 	{
+		connection_warnings();
+		if (!pset.quiet && !pset.notty)
+			printf(_("Type \"help\" for help.\n"));
 		if (!options.no_psqlrc)
 			process_psqlrc(argv[0]);
-
-		connection_warnings();
+		/* output newline here because .psqlrc might output something */
 		if (!pset.quiet && !pset.notty)
-			printf(_("Type \"help\" for help.\n\n"));
+			printf("\n");
 		if (!pset.notty)
 			initializeInput(options.no_readline ? 0 : 1);
 		if (options.action_string)		/* -f - was used */