Commit25c9de4

committed

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

1 parentdc02a48 commit25c9de4Copy full SHA for 25c9de4

File tree

-4

lines changed

-4

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2008, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.149 2008/07/01 00:08:18 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.150 2008/07/18 17:19:55 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`
`@@ -281,12 +281,14 @@ main(int argc, char *argv[])`
`281`	`281`	`*/`
`282`	`282`	`else`
`283`	`283`	`{`
	`284`	`+connection_warnings();`
	`285`	`+if (!pset.quiet&& !pset.notty)`
	`286`	`+printf(_("Type \"help\" for help.\n"));`
`284`	`287`	`if (!options.no_psqlrc)`
`285`	`288`	`process_psqlrc(argv[0]);`
`286`		`-`
`287`		`-connection_warnings();`
	`289`	`+/* output newline here because .psqlrc might output something */`
`288`	`290`	`if (!pset.quiet&& !pset.notty)`
`289`		`-printf(_("Type \"help\" for help.\n\n"));`
	`291`	`+printf("\n");`
`290`	`292`	`if (!pset.notty)`
`291`	`293`	`initializeInput(options.no_readline ?0 :1);`
`292`	`294`	`if (options.action_string)/* -f - was used */`

Comments

(0)