1
0
mirror of https://github.com/postgres/postgres.git synced 2025-12-12 02:37:31 +03:00

Add -L option to psql to log sessions.

Lorne Sunley
This commit is contained in:
Bruce Momjian
2005-06-14 02:57:45 +00:00
parent e31cd6739a
commit 2ee0d5549f
11 changed files with 89 additions and 41 deletions

View File

@@ -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);