Commitb3f66d1

committed

Add command '\pset footer' to psql to turn off default "(x rows)" footer.

1 parentbbc3920 commitb3f66d1Copy full SHA for b3f66d1

File tree

+30

-7

lines changed

+30

-7

lines changed

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`<!--`
`2`		`-$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.51 2001/05/09 17:29:10 momjian Exp $`
	`2`	`+$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.52 2001/05/12 19:44:45 petere Exp $`
`3`	`3`	`Postgres documentation`
`4`	`4`	`-->`
`5`	`5`
`@@ -898,6 +898,15 @@ lo_import 152801`
`898`	`898`	`</listitem>`
`899`	`899`	`</varlistentry>`
`900`	`900`
	`901`	`+ <varlistentry>`
	`902`	`+ <term><literal>footer</literal></term>`
	`903`	`+ <listitem>`
	`904`	`+ <para>`
	`905`	`+ Toggles the display of the default footer <literal>(x rows)</literal>.`
	`906`	`+ </para>`
	`907`	`+ </listitem>`
	`908`	`+ </varlistentry>`
	`909`	`+`
`901`	`910`	`<varlistentry>`
`902`	`911`	`<term><literal>recordsep</literal></term>`
`903`	`912`	`<listitem>`

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright 2000 by PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.53 2001/05/1217:37:15 tgl Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.54 2001/05/1219:44:46 petere Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"command.h"`
`@@ -1796,6 +1796,18 @@ do_pset(const char param, const char value, printQueryOpt *popt, bool quiet)`
`1796`	`1796`	`}`
`1797`	`1797`	`}`
`1798`	`1798`
	`1799`	`+/* disable "(x rows)" footer */`
	`1800`	`+elseif (strcmp(param,"footer")==0)`
	`1801`	`+{`
	`1802`	`+popt->default_footer= !popt->default_footer;`
	`1803`	`+if (!quiet)`
	`1804`	`+{`
	`1805`	`+if (popt->default_footer)`
	`1806`	`+puts("Default footer is on.");`
	`1807`	`+else`
	`1808`	`+puts("Default footer is off.");`
	`1809`	`+}`
	`1810`	`+}`
`1799`	`1811`
`1800`	`1812`	`else`
`1801`	`1813`	`{`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright 2000 by PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $Header: /cvsroot/pgsql/src/bin/psql/print.c,v 1.18 2001/03/22 04:00:22 momjian Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/print.c,v 1.19 2001/05/12 19:44:46 petere Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"print.h"`
`@@ -1058,7 +1058,7 @@ printQuery(const PGresult result, const printQueryOpt opt, FILE *fout)`
`1058`	`1058`
`1059`	`1059`	`if (opt->footers)`
`1060`	`1060`	`footers=opt->footers;`
`1061`		`-elseif (!opt->topt.expanded)`
	`1061`	`+elseif (!opt->topt.expanded&&opt->default_footer)`
`1062`	`1062`	`{`
`1063`	`1063`	`footers=calloc(2,sizeof(*footers));`
`1064`	`1064`	`if (!footers)`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright 2000 by PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $Header: /cvsroot/pgsql/src/bin/psql/print.h,v 1.8 2000/04/1217:16:23 momjian Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/print.h,v 1.9 2001/05/1219:44:46 petere Exp $`
`7`	`7`	`*/`
`8`	`8`	`#ifndefPRINT_H`
`9`	`9`	`#definePRINT_H`
`@@ -64,6 +64,7 @@ typedef struct _printQueryOpt`
`64`	`64`	`chartitle;/ override title */`
`65`	`65`	`char*footers;/ override footer (default is "(xx`
`66`	`66`	`* rows)") */`
	`67`	`+booldefault_footer;/* print default footer if footers==NULL */`
`67`	`68`	`}printQueryOpt;`
`68`	`69`
`69`	`70`	`/*`
`@@ -72,7 +73,7 @@ typedef struct _printQueryOpt`
`72`	`73`	`* It calls the printTable above with all the things set straight.`
`73`	`74`	`*/`
`74`	`75`	`void`
`75`		`-printQuery(constPGresultresult,constprintQueryOptopt,FILE*fout);`
	`76`	`+printQuery(constPGresultresult,constprintQueryOptopt,FILE*fout);`
`76`	`77`
`77`	`78`
`78`	`79`	`#endif/* PRINT_H */`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright 2000 by PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.47 2001/05/06 17:38:32 petere Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.48 2001/05/12 19:44:46 petere Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`
`@@ -135,6 +135,7 @@ main(int argc, char *argv[])`
`135`	`135`	`pset.queryFout=stdout;`
`136`	`136`	`pset.popt.topt.border=1;`
`137`	`137`	`pset.popt.topt.pager= true;`
	`138`	`+pset.popt.default_footer= true;`
`138`	`139`
`139`	`140`	`SetVariable(pset.vars,"VERSION",PG_VERSION_STR);`
`140`	`141`

Comments

(0)