diff options
Diffstat (limited to 'src/bin/psql/common.c')
| -rw-r--r-- | src/bin/psql/common.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c index b1cec744996..df17d0404bc 100644 --- a/src/bin/psql/common.c +++ b/src/bin/psql/common.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2005, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.101 2005/06/13 06:36:22 neilc Exp $ + * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.102 2005/06/14 02:57:41 momjian Exp $ */ #include "postgres_fe.h" #include "common.h" @@ -723,6 +723,13 @@ PSQLexec(const char *query, bool start_xact) "%s\n" "**************************\n\n", query); fflush(stdout); + if (pset.logfile) + { + fprintf(pset.logfile, "********* QUERY **********\n" + "%s\n" + "**************************\n\n", query); + fflush(pset.logfile); + } if (echo_hidden == 1) /* noexec? */ return NULL; @@ -803,7 +810,7 @@ PrintQueryTuples(const PGresult *results) return false; } - printQuery(results, &my_popt, pset.queryFout); + printQuery(results, &my_popt, pset.queryFout, pset.logfile); /* close file/pipe, restore old setting */ setQFout(NULL); @@ -815,7 +822,7 @@ PrintQueryTuples(const PGresult *results) pset.gfname = NULL; } else - printQuery(results, &my_popt, pset.queryFout); + printQuery(results, &my_popt, pset.queryFout, pset.logfile); return true; } @@ -905,6 +912,8 @@ PrintQueryResults(PGresult *results) else fprintf(pset.queryFout, "%s\n", PQcmdStatus(results)); } + if (pset.logfile) + fprintf(pset.logfile, "%s\n", PQcmdStatus(results)); SetVariable(pset.vars, "LASTOID", buf); break; } @@ -976,6 +985,14 @@ SendQuery(const char *query) fflush(stdout); } + if (pset.logfile) + { + fprintf(pset.logfile, "********* QUERY **********\n" + "%s\n" + "**************************\n\n", query); + fflush(pset.logfile); + } + SetCancelConn(); transaction_status = PQtransactionStatus(pset.db); |