database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-12-13 14:22:43 +03:00
Code Activity

Per discussion on -hackers, this patch changes psql's "expanded" output

Browse Source 
mode to only affect the presentation of normal query results, not the
output of psql slash commands. Documentation updated. I also made
some unrelated minor psql cleanup. Per suggestion from Stuart Cooper.
This commit is contained in:
Neil Conway
2005-06-13 06:36:22 +00:00
parent 8c05ca7754
commit 077811605e
7 changed files with 77 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/psql/common.c
View File

@@ -3,7 +3,7 @@
*
* Copyright (c) 2000-2005, PostgreSQL Global Development Group
*
* $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.100 2005/06/10 14:49:31 momjian Exp $
* $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.101 2005/06/13 06:36:22 neilc Exp $
*/
#include "postgres_fe.h"
#include "common.h"
@@ -64,7 +64,6 @@ extern bool prompt_state;
static bool command_no_begin(const char *query);
/*
* "Safe" wrapper around strdup()
*/
@@ -189,7 +188,7 @@ setQFout(const char *fname)
*
*/
void
psql_error(const char *fmt,...)
psql_error(const char *fmt, ...)
{
va_list ap;
@@ -784,6 +783,10 @@ PrintNotifications(void)
static bool
PrintQueryTuples(const PGresult *results)
{
printQueryOpt my_popt = pset.popt;
my_popt.topt.normal_query = true;
/* write output to \g argument, if any */
if (pset.gfname)
{
@@ -800,7 +803,7 @@ PrintQueryTuples(const PGresult *results)
return false;
}
printQuery(results, &pset.popt, pset.queryFout);
printQuery(results, &my_popt, pset.queryFout);
/* close file/pipe, restore old setting */
setQFout(NULL);
@@ -812,7 +815,7 @@ PrintQueryTuples(const PGresult *results)
pset.gfname = NULL;
}
else
printQuery(results, &pset.popt, pset.queryFout);
printQuery(results, &my_popt, pset.queryFout);
return true;
}
@@ -1001,7 +1004,7 @@ SendQuery(const char *query)
if (on_error_rollback_warning == false && pset.sversion < 80000)
{
fprintf(stderr, _("The server version (%d) does not support savepoints for ON_ERROR_ROLLBACK.\n"),
pset.sversion);
pset.sversion);
on_error_rollback_warning = true;
}
else