database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-25 21:42:33 +03:00
Code

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

Browse Source
This commit is contained in:
Bruce Momjian 2008-07-18 17:19:55 +00:00
parent dc02a4814a
commit 25c9de4d84
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bin/psql/startup.c
View File

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2008, PostgreSQL Global Development Group * 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" #include "postgres_fe.h"
@ -281,12 +281,14 @@ main(int argc, char *argv[])
*/ */
else else
{ {
if (!options.no_psqlrc)
process_psqlrc(argv[0]);
connection_warnings(); connection_warnings();
if (!pset.quiet && !pset.notty) if (!pset.quiet && !pset.notty)
printf(_("Type \"help\" for help.\n\n")); printf(_("Type \"help\" for help.\n"));
if (!options.no_psqlrc)
process_psqlrc(argv[0]);
/* output newline here because .psqlrc might output something */
if (!pset.quiet && !pset.notty)
printf("\n");
if (!pset.notty) if (!pset.notty)
initializeInput(options.no_readline ? 0 : 1); initializeInput(options.no_readline ? 0 : 1);
if (options.action_string) /* -f - was used */ if (options.action_string) /* -f - was used */