aboutsummaryrefslogtreecommitdiff
path: root/src/bin/monitor/monitor.c
diff options
context:
space:
mode:
authorMarc G. Fournier <scrappy@hub.org>1996-07-23 02:26:41 +0000
committerMarc G. Fournier <scrappy@hub.org>1996-07-23 02:26:41 +0000
commitd1724d65b7506b376fc8a090e73344c9587371ad (patch)
tree8052d2873a1c7d639990ac40e1ae83995a086ea7 /src/bin/monitor/monitor.c
parent7344d6989878ff313d65a6ec15b6ed027b47e248 (diff)
downloadpostgresql-d1724d65b7506b376fc8a090e73344c9587371ad.tar.gz
postgresql-d1724d65b7506b376fc8a090e73344c9587371ad.zip
reversed julian's patch back in again...othere things cause monitor
to not compile now...
Diffstat (limited to 'src/bin/monitor/monitor.c')
-rw-r--r--src/bin/monitor/monitor.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/bin/monitor/monitor.c b/src/bin/monitor/monitor.c
index 28a8cca67b1..21812898d9d 100644
--- a/src/bin/monitor/monitor.c
+++ b/src/bin/monitor/monitor.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/monitor/Attic/monitor.c,v 1.3 1996/07/22 05:59:53 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/bin/monitor/Attic/monitor.c,v 1.4 1996/07/23 02:26:41 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@@ -642,6 +642,7 @@ handle_execution(char *query)
{
PGresult *result;
int retval = 0;
+ PQprintOpt opt;
result = PQexec(conn, query);
@@ -657,11 +658,18 @@ handle_execution(char *query)
break;
case PGRES_TUPLES_OK:
/* PQprintTuples(result,stdout,PrintAttNames,TerseOutput,COLWIDTH); */
- if (TerseOutput)
+/* if (TerseOutput)
PQdisplayTuples(result,stdout,1,"",PrintAttNames,TerseOutput);
else
- PQdisplayTuples(result,stdout,1,"|",PrintAttNames,TerseOutput);
- break;
+ PQdisplayTuples(result,stdout,1,"|",PrintAttNames,TerseOutput); */
+ memset(&opt, 0, sizeof opt);
+ opt.header = opt.align = opt.standard = 1;
+ if (TerseOutput)
+ opt.fieldSep = "";
+ else
+ opt.fieldSep = "|";
+ PQprint(stdout, result, &opt);
+ break;
case PGRES_COPY_OUT:
handle_copy_out(result);
break;