From b3f66d198005a55dd496de74ac77c768420772f7 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Sat, 12 May 2001 19:44:46 +0000
Subject: [PATCH] Add command '\pset footer' to psql to turn off default "(x
rows)" footer.
---
doc/src/sgml/ref/psql-ref.sgml | 11 ++++++++++-
src/bin/psql/command.c | 14 +++++++++++++-
src/bin/psql/print.c | 4 ++--
src/bin/psql/print.h | 5 +++--
src/bin/psql/startup.c | 3 ++-
5 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index a5a1dc8ac00..af3b90968e2 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.51 2001/05/09 17:29:10 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.52 2001/05/12 19:44:45 petere Exp $
Postgres documentation
-->
@@ -898,6 +898,15 @@ lo_import 152801
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><literal>footer</literal></term>
+ <listitem>
+ <para>
+ Toggles the display of the default footer <literal>(x rows)</literal>.
+ </para>
+ </listitem>
+ </varlistentry>
+
<varlistentry>
<term><literal>recordsep</literal></term>
<listitem>
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 7604cccbd00..e17f8a04b4f 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
- * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.53 2001/05/12 17:37:15 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.54 2001/05/12 19:44:46 petere Exp $
*/
#include "postgres_fe.h"
#include "command.h"
@@ -1796,6 +1796,18 @@ do_pset(const char *param, const char *value, printQueryOpt *popt, bool quiet)
}
}
+ /* disable "(x rows)" footer */
+ else if (strcmp(param, "footer") == 0)
+ {
+ popt->default_footer = !popt->default_footer;
+ if (!quiet)
+ {
+ if (popt->default_footer)
+ puts("Default footer is on.");
+ else
+ puts("Default footer is off.");
+ }
+ }
else
{
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
index 56f15427a31..a047a59eb31 100644
--- a/src/bin/psql/print.c
+++ b/src/bin/psql/print.c
@@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
- * $Header: /cvsroot/pgsql/src/bin/psql/print.c,v 1.18 2001/03/22 04:00:22 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/print.c,v 1.19 2001/05/12 19:44:46 petere Exp $
*/
#include "postgres_fe.h"
#include "print.h"
@@ -1058,7 +1058,7 @@ printQuery(const PGresult *result, const printQueryOpt *opt, FILE *fout)
if (opt->footers)
footers = opt->footers;
- else if (!opt->topt.expanded)
+ else if (!opt->topt.expanded && opt->default_footer)
{
footers = calloc(2, sizeof(*footers));
if (!footers)
diff --git a/src/bin/psql/print.h b/src/bin/psql/print.h
index d2c8980ba78..1cc3bcb6e22 100644
--- a/src/bin/psql/print.h
+++ b/src/bin/psql/print.h
@@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
- * $Header: /cvsroot/pgsql/src/bin/psql/print.h,v 1.8 2000/04/12 17:16:23 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/print.h,v 1.9 2001/05/12 19:44:46 petere Exp $
*/
#ifndef PRINT_H
#define PRINT_H
@@ -64,6 +64,7 @@ typedef struct _printQueryOpt
char *title; /* override title */
char **footers; /* override footer (default is "(xx
* rows)") */
+ bool default_footer; /* print default footer if footers==NULL */
} printQueryOpt;
/*
@@ -72,7 +73,7 @@ typedef struct _printQueryOpt
* It calls the printTable above with all the things set straight.
*/
void
- printQuery(const PGresult *result, const printQueryOpt *opt, FILE *fout);
+printQuery(const PGresult *result, const printQueryOpt *opt, FILE *fout);
#endif /* PRINT_H */
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 3d38afaf6ba..91e3f4adbc1 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
- * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.47 2001/05/06 17:38:32 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.48 2001/05/12 19:44:46 petere Exp $
*/
#include "postgres_fe.h"
@@ -135,6 +135,7 @@ main(int argc, char *argv[])
pset.queryFout = stdout;
pset.popt.topt.border = 1;
pset.popt.topt.pager = true;
+ pset.popt.default_footer = true;
SetVariable(pset.vars, "VERSION", PG_VERSION_STR);
--
GitLab