psql \watch versus \timing

*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
***************
*** 2690,2695 **** do_watch(PQExpBuffer query_buf, long sleep)
--- 2690,2696 ----
  		PGresult   *res;
  		time_t		timer;
  		long		i;
+ 		double	elapsed_msec = 0;
  
  		/*
  		 * Prepare title for output.  XXX would it be better to use the time
***************
*** 2701,2710 **** do_watch(PQExpBuffer query_buf, long sleep)
  		myopt.title = title;
  
  		/*
! 		 * Run the query.  We use PSQLexec, which is kind of cheating, but
! 		 * SendQuery doesn't let us suppress autocommit behavior.
  		 */
! 		res = PSQLexec(query_buf->data, false);
  
  		/* PSQLexec handles failure results and returns NULL */
  		if (res == NULL)
--- 2702,2711 ----
  		myopt.title = title;
  
  		/*
! 		 * Run the query.  We use PSQLexecInternal, which is kind of cheating,
! 		 * but SendQuery doesn't let us suppress autocommit behavior.
  		 */
! 		res = PSQLexecInternal(query_buf->data, false, &elapsed_msec);
  
  		/* PSQLexec handles failure results and returns NULL */
  		if (res == NULL)
***************
*** 2755,2760 **** do_watch(PQExpBuffer query_buf, long sleep)
--- 2756,2765 ----
  
  		fflush(pset.queryFout);
  
+ 		/* Possible microtiming output */
+ 		if (pset.timing)
+ 			printf(_("Time: %.3f ms\n"), elapsed_msec);
+ 
  		/*
  		 * Set up cancellation of 'watch' via SIGINT.  We redo this each time
  		 * through the loop since it's conceivable something inside PSQLexec
*** a/src/bin/psql/common.c
--- b/src/bin/psql/common.c
***************
*** 439,445 **** AcceptResult(const PGresult *result)
--- 439,459 ----
  PGresult *
  PSQLexec(const char *query, bool start_xact)
  {
+ 	return PSQLexecInternal(query, start_xact, NULL);
+ }
+ 
+ /*
+  * Send "backdoor" queries.
+  *
+  * Measure how long the given query takes if elapsed_msec is not NULL and
+  * \timing is enabled.
+  */
+ PGresult *
+ PSQLexecInternal(const char *query, bool start_xact, double *elapsed_msec)
+ {
  	PGresult   *res;
+ 	instr_time	before;
+ 	instr_time	after;
  
  	if (!pset.db)
  	{
***************
*** 483,488 **** PSQLexec(const char *query, bool start_xact)
--- 497,505 ----
  		PQclear(res);
  	}
  
+ 	if (elapsed_msec != NULL && pset.timing)
+ 		INSTR_TIME_SET_CURRENT(before);
+ 
  	res = PQexec(pset.db, query);
  
  	ResetCancelConn();
***************
*** 493,498 **** PSQLexec(const char *query, bool start_xact)
--- 510,522 ----
  		res = NULL;
  	}
  
+ 	if (elapsed_msec != NULL && pset.timing)
+ 	{
+ 		INSTR_TIME_SET_CURRENT(after);
+ 		INSTR_TIME_SUBTRACT(after, before);
+ 		*elapsed_msec = INSTR_TIME_GET_MILLISEC(after);
+ 	}
+ 
  	return res;
  }
  
*** a/src/bin/psql/common.h
--- b/src/bin/psql/common.h
***************
*** 37,42 **** extern void SetCancelConn(void);
--- 37,44 ----
  extern void ResetCancelConn(void);
  
  extern PGresult *PSQLexec(const char *query, bool start_xact);
+ extern PGresult *PSQLexecInternal(const char *query, bool start_xact,
+ 								double *elapsed_msec);
  
  extern bool SendQuery(const char *query);
  

*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
***************
*** 2687,2693 **** do_watch(PQExpBuffer query_buf, long sleep)
  
  	for (;;)
  	{
! 		PGresult   *res;
  		time_t		timer;
  		long		i;
  
--- 2687,2693 ----
  
  	for (;;)
  	{
! 		int	res;
  		time_t		timer;
  		long		i;
  
***************
*** 2701,2759 **** do_watch(PQExpBuffer query_buf, long sleep)
  		myopt.title = title;
  
  		/*
! 		 * Run the query.  We use PSQLexec, which is kind of cheating, but
! 		 * SendQuery doesn't let us suppress autocommit behavior.
  		 */
! 		res = PSQLexec(query_buf->data, false);
! 
! 		/* PSQLexec handles failure results and returns NULL */
! 		if (res == NULL)
! 			break;
  
  		/*
! 		 * If SIGINT is sent while the query is processing, PSQLexec will
! 		 * consume the interrupt.  The user's intention, though, is to cancel
! 		 * the entire watch process, so detect a sent cancellation request and
! 		 * exit in this case.
  		 */
! 		if (cancel_pressed)
! 		{
! 			PQclear(res);
  			break;
! 		}
! 
! 		switch (PQresultStatus(res))
! 		{
! 			case PGRES_TUPLES_OK:
! 				printQuery(res, &myopt, pset.queryFout, pset.logfile);
! 				break;
! 
! 			case PGRES_COMMAND_OK:
! 				fprintf(pset.queryFout, "%s\n%s\n\n", title, PQcmdStatus(res));
! 				break;
! 
! 			case PGRES_EMPTY_QUERY:
! 				psql_error(_("\\watch cannot be used with an empty query\n"));
! 				PQclear(res);
! 				return false;
! 
! 			case PGRES_COPY_OUT:
! 			case PGRES_COPY_IN:
! 			case PGRES_COPY_BOTH:
! 				psql_error(_("\\watch cannot be used with COPY\n"));
! 				PQclear(res);
! 				return false;
! 
! 			default:
! 				/* other cases should have been handled by PSQLexec */
! 				psql_error(_("unexpected result status for \\watch\n"));
! 				PQclear(res);
! 				return false;
! 		}
! 
! 		PQclear(res);
! 
! 		fflush(pset.queryFout);
  
  		/*
  		 * Set up cancellation of 'watch' via SIGINT.  We redo this each time
--- 2701,2720 ----
  		myopt.title = title;
  
  		/*
! 		 * Run the query and print out the results. We use PSQLexecWatch,
! 		 * which is kind of cheating, but SendQuery doesn't let us suppress
! 		 * autocommit behavior.
  		 */
! 		res = PSQLexecWatch(query_buf->data, &myopt);
  
  		/*
! 		 * PSQLexecWatch handles the case where we can no longer
! 		 * repeat the query, and returns 0 or -1.
  		 */
! 		if (res == 0)
  			break;
! 		if (res == -1)
! 			return false;
  
  		/*
  		 * Set up cancellation of 'watch' via SIGINT.  We redo this each time
*** a/src/bin/psql/common.c
--- b/src/bin/psql/common.c
***************
*** 497,502 **** PSQLexec(const char *query, bool start_xact)
--- 497,598 ----
  }
  
  
+ /*
+  * PSQLexecWatch
+  *
+  * This function is used for \watch command to send the query to
+  * the server and print out the results.
+  *
+  * Returns 1 if the query executed successfully, 0 if it cannot be repeated,
+  * e.g., because of the interrupt, -1 on error.
+  */
+ int
+ PSQLexecWatch(const char *query, const printQueryOpt *opt)
+ {
+ 	PGresult   *res;
+ 	double	elapsed_msec = 0;
+ 	instr_time	before;
+ 	instr_time	after;
+ 
+ 	if (!pset.db)
+ 	{
+ 		psql_error("You are currently not connected to a database.\n");
+ 		return 0;
+ 	}
+ 
+ 	SetCancelConn();
+ 
+ 	if (pset.timing)
+ 		INSTR_TIME_SET_CURRENT(before);
+ 
+ 	res = PQexec(pset.db, query);
+ 
+ 	ResetCancelConn();
+ 
+ 	if (!AcceptResult(res))
+ 	{
+ 		PQclear(res);
+ 		return 0;
+ 	}
+ 
+ 	if (pset.timing)
+ 	{
+ 		INSTR_TIME_SET_CURRENT(after);
+ 		INSTR_TIME_SUBTRACT(after, before);
+ 		elapsed_msec = INSTR_TIME_GET_MILLISEC(after);
+ 	}
+ 
+ 	/*
+ 	 * If SIGINT is sent while the query is processing, the interrupt
+ 	 * will be consumed.  The user's intention, though, is to cancel
+ 	 * the entire watch process, so detect a sent cancellation request and
+ 	 * exit in this case.
+ 	 */
+ 	if (cancel_pressed)
+ 	{
+ 		PQclear(res);
+ 		return 0;
+ 	}
+ 
+ 	switch (PQresultStatus(res))
+ 	{
+ 		case PGRES_TUPLES_OK:
+ 			printQuery(res, opt, pset.queryFout, pset.logfile);
+ 			break;
+ 
+ 		case PGRES_COMMAND_OK:
+ 			fprintf(pset.queryFout, "%s\n%s\n\n", opt->title, PQcmdStatus(res));
+ 			break;
+ 
+ 		case PGRES_EMPTY_QUERY:
+ 			psql_error(_("\\watch cannot be used with an empty query\n"));
+ 			PQclear(res);
+ 			return -1;
+ 
+ 		case PGRES_COPY_OUT:
+ 		case PGRES_COPY_IN:
+ 		case PGRES_COPY_BOTH:
+ 			psql_error(_("\\watch cannot be used with COPY\n"));
+ 			PQclear(res);
+ 			return -1;
+ 
+ 		default:
+ 			psql_error(_("unexpected result status for \\watch\n"));
+ 			PQclear(res);
+ 			return -1;
+ 	}
+ 
+ 	PQclear(res);
+ 
+ 	fflush(pset.queryFout);
+ 
+ 	/* Possible microtiming output */
+ 	if (pset.timing)
+ 		printf(_("Time: %.3f ms\n"), elapsed_msec);
+ 
+ 	return 1;
+ }
+ 
  
  /*
   * PrintNotifications: check for asynchronous notifications, and print them out
*** a/src/bin/psql/common.h
--- b/src/bin/psql/common.h
***************
*** 12,17 ****
--- 12,19 ----
  #include <setjmp.h>
  #include "libpq-fe.h"
  
+ #include "print.h"
+ 
  #define atooid(x)  ((Oid) strtoul((x), NULL, 10))
  
  extern bool setQFout(const char *fname);
***************
*** 37,42 **** extern void SetCancelConn(void);
--- 39,45 ----
  extern void ResetCancelConn(void);
  
  extern PGresult *PSQLexec(const char *query, bool start_xact);
+ extern int PSQLexecWatch(const char *query, const printQueryOpt *opt);
  
  extern bool SendQuery(const char *query);
  

*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
***************
*** 2687,2693 **** do_watch(PQExpBuffer query_buf, long sleep)
  
  	for (;;)
  	{
! 		PGresult   *res;
  		time_t		timer;
  		long		i;
  
--- 2687,2693 ----
  
  	for (;;)
  	{
! 		int	res;
  		time_t		timer;
  		long		i;
  
***************
*** 2700,2764 **** do_watch(PQExpBuffer query_buf, long sleep)
  				 sleep, asctime(localtime(&timer)));
  		myopt.title = title;
  
! 		/*
! 		 * Run the query.  We use PSQLexec, which is kind of cheating, but
! 		 * SendQuery doesn't let us suppress autocommit behavior.
! 		 */
! 		res = PSQLexec(query_buf->data, false);
! 
! 		/* PSQLexec handles failure results and returns NULL */
! 		if (res == NULL)
! 			break;
  
  		/*
! 		 * If SIGINT is sent while the query is processing, PSQLexec will
! 		 * consume the interrupt.  The user's intention, though, is to cancel
! 		 * the entire watch process, so detect a sent cancellation request and
! 		 * exit in this case.
  		 */
! 		if (cancel_pressed)
! 		{
! 			PQclear(res);
  			break;
! 		}
! 
! 		switch (PQresultStatus(res))
! 		{
! 			case PGRES_TUPLES_OK:
! 				printQuery(res, &myopt, pset.queryFout, pset.logfile);
! 				break;
! 
! 			case PGRES_COMMAND_OK:
! 				fprintf(pset.queryFout, "%s\n%s\n\n", title, PQcmdStatus(res));
! 				break;
! 
! 			case PGRES_EMPTY_QUERY:
! 				psql_error(_("\\watch cannot be used with an empty query\n"));
! 				PQclear(res);
! 				return false;
! 
! 			case PGRES_COPY_OUT:
! 			case PGRES_COPY_IN:
! 			case PGRES_COPY_BOTH:
! 				psql_error(_("\\watch cannot be used with COPY\n"));
! 				PQclear(res);
! 				return false;
! 
! 			default:
! 				/* other cases should have been handled by PSQLexec */
! 				psql_error(_("unexpected result status for \\watch\n"));
! 				PQclear(res);
! 				return false;
! 		}
! 
! 		PQclear(res);
! 
! 		fflush(pset.queryFout);
  
  		/*
  		 * Set up cancellation of 'watch' via SIGINT.  We redo this each time
! 		 * through the loop since it's conceivable something inside PSQLexec
! 		 * could change sigint_interrupt_jmp.
  		 */
  		if (sigsetjmp(sigint_interrupt_jmp, 1) != 0)
  			break;
--- 2700,2721 ----
  				 sleep, asctime(localtime(&timer)));
  		myopt.title = title;
  
! 		/* Run the query and print out the results */
! 		res = PSQLexecWatch(query_buf->data, &myopt);
  
  		/*
! 		 * PSQLexecWatch handles the case where we can no longer
! 		 * repeat the query, and returns 0 or -1.
  		 */
! 		if (res == 0)
  			break;
! 		if (res == -1)
! 			return false;
  
  		/*
  		 * Set up cancellation of 'watch' via SIGINT.  We redo this each time
! 		 * through the loop since it's conceivable something inside
! 		 * PSQLexecWatch could change sigint_interrupt_jmp.
  		 */
  		if (sigsetjmp(sigint_interrupt_jmp, 1) != 0)
  			break;
*** a/src/bin/psql/common.c
--- b/src/bin/psql/common.c
***************
*** 497,502 **** PSQLexec(const char *query, bool start_xact)
--- 497,598 ----
  }
  
  
+ /*
+  * PSQLexecWatch
+  *
+  * This function is used for \watch command to send the query to
+  * the server and print out the results.
+  *
+  * Returns 1 if the query executed successfully, 0 if it cannot be repeated,
+  * e.g., because of the interrupt, -1 on error.
+  */
+ int
+ PSQLexecWatch(const char *query, const printQueryOpt *opt)
+ {
+ 	PGresult   *res;
+ 	double	elapsed_msec = 0;
+ 	instr_time	before;
+ 	instr_time	after;
+ 
+ 	if (!pset.db)
+ 	{
+ 		psql_error("You are currently not connected to a database.\n");
+ 		return 0;
+ 	}
+ 
+ 	SetCancelConn();
+ 
+ 	if (pset.timing)
+ 		INSTR_TIME_SET_CURRENT(before);
+ 
+ 	res = PQexec(pset.db, query);
+ 
+ 	ResetCancelConn();
+ 
+ 	if (!AcceptResult(res))
+ 	{
+ 		PQclear(res);
+ 		return 0;
+ 	}
+ 
+ 	if (pset.timing)
+ 	{
+ 		INSTR_TIME_SET_CURRENT(after);
+ 		INSTR_TIME_SUBTRACT(after, before);
+ 		elapsed_msec = INSTR_TIME_GET_MILLISEC(after);
+ 	}
+ 
+ 	/*
+ 	 * If SIGINT is sent while the query is processing, the interrupt
+ 	 * will be consumed.  The user's intention, though, is to cancel
+ 	 * the entire watch process, so detect a sent cancellation request and
+ 	 * exit in this case.
+ 	 */
+ 	if (cancel_pressed)
+ 	{
+ 		PQclear(res);
+ 		return 0;
+ 	}
+ 
+ 	switch (PQresultStatus(res))
+ 	{
+ 		case PGRES_TUPLES_OK:
+ 			printQuery(res, opt, pset.queryFout, pset.logfile);
+ 			break;
+ 
+ 		case PGRES_COMMAND_OK:
+ 			fprintf(pset.queryFout, "%s\n%s\n\n", opt->title, PQcmdStatus(res));
+ 			break;
+ 
+ 		case PGRES_EMPTY_QUERY:
+ 			psql_error(_("\\watch cannot be used with an empty query\n"));
+ 			PQclear(res);
+ 			return -1;
+ 
+ 		case PGRES_COPY_OUT:
+ 		case PGRES_COPY_IN:
+ 		case PGRES_COPY_BOTH:
+ 			psql_error(_("\\watch cannot be used with COPY\n"));
+ 			PQclear(res);
+ 			return -1;
+ 
+ 		default:
+ 			psql_error(_("unexpected result status for \\watch\n"));
+ 			PQclear(res);
+ 			return -1;
+ 	}
+ 
+ 	PQclear(res);
+ 
+ 	fflush(pset.queryFout);
+ 
+ 	/* Possible microtiming output */
+ 	if (pset.timing)
+ 		printf(_("Time: %.3f ms\n"), elapsed_msec);
+ 
+ 	return 1;
+ }
+ 
  
  /*
   * PrintNotifications: check for asynchronous notifications, and print them out
*** a/src/bin/psql/common.h
--- b/src/bin/psql/common.h
***************
*** 12,17 ****
--- 12,19 ----
  #include <setjmp.h>
  #include "libpq-fe.h"
  
+ #include "print.h"
+ 
  #define atooid(x)  ((Oid) strtoul((x), NULL, 10))
  
  extern bool setQFout(const char *fname);
***************
*** 37,42 **** extern void SetCancelConn(void);
--- 39,45 ----
  extern void ResetCancelConn(void);
  
  extern PGresult *PSQLexec(const char *query, bool start_xact);
+ extern int PSQLexecWatch(const char *query, const printQueryOpt *opt);
  
  extern bool SendQuery(const char *query);
  

*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
***************
*** 966,972 **** exec_command(const char *cmd,
  				printfPQExpBuffer(&buf, "ALTER USER %s PASSWORD ",
  								  fmtId(user));
  				appendStringLiteralConn(&buf, encrypted_password, pset.db);
! 				res = PSQLexec(buf.data, false);
  				termPQExpBuffer(&buf);
  				if (!res)
  					success = false;
--- 966,972 ----
  				printfPQExpBuffer(&buf, "ALTER USER %s PASSWORD ",
  								  fmtId(user));
  				appendStringLiteralConn(&buf, encrypted_password, pset.db);
! 				res = PSQLexec(buf.data);
  				termPQExpBuffer(&buf);
  				if (!res)
  					success = false;
***************
*** 2173,2179 **** process_file(char *filename, bool single_txn, bool use_relative_path)
  
  	if (single_txn)
  	{
! 		if ((res = PSQLexec("BEGIN", false)) == NULL)
  		{
  			if (pset.on_error_stop)
  			{
--- 2173,2179 ----
  
  	if (single_txn)
  	{
! 		if ((res = PSQLexec("BEGIN")) == NULL)
  		{
  			if (pset.on_error_stop)
  			{
***************
*** 2189,2195 **** process_file(char *filename, bool single_txn, bool use_relative_path)
  
  	if (single_txn)
  	{
! 		if ((res = PSQLexec("COMMIT", false)) == NULL)
  		{
  			if (pset.on_error_stop)
  			{
--- 2189,2195 ----
  
  	if (single_txn)
  	{
! 		if ((res = PSQLexec("COMMIT")) == NULL)
  		{
  			if (pset.on_error_stop)
  			{
*** a/src/bin/psql/common.c
--- b/src/bin/psql/common.c
***************
*** 426,435 **** AcceptResult(const PGresult *result)
   * This is the way to send "backdoor" queries (those not directly entered
   * by the user). It is subject to -E but not -e.
   *
-  * In autocommit-off mode, a new transaction block is started if start_xact
-  * is true; nothing special is done when start_xact is false.  Typically,
-  * start_xact = false is used for SELECTs and explicit BEGIN/COMMIT commands.
-  *
   * Caller is responsible for handling the ensuing processing if a COPY
   * command is sent.
   *
--- 426,431 ----
***************
*** 437,443 **** AcceptResult(const PGresult *result)
   * caller uses this path to issue "SET CLIENT_ENCODING".
   */
  PGresult *
! PSQLexec(const char *query, bool start_xact)
  {
  	PGresult   *res;
  
--- 433,439 ----
   * caller uses this path to issue "SET CLIENT_ENCODING".
   */
  PGresult *
! PSQLexec(const char *query)
  {
  	PGresult   *res;
  
***************
*** 468,488 **** PSQLexec(const char *query, bool start_xact)
  
  	SetCancelConn();
  
- 	if (start_xact &&
- 		!pset.autocommit &&
- 		PQtransactionStatus(pset.db) == PQTRANS_IDLE)
- 	{
- 		res = PQexec(pset.db, "BEGIN");
- 		if (PQresultStatus(res) != PGRES_COMMAND_OK)
- 		{
- 			psql_error("%s", PQerrorMessage(pset.db));
- 			PQclear(res);
- 			ResetCancelConn();
- 			return NULL;
- 		}
- 		PQclear(res);
- 	}
- 
  	res = PQexec(pset.db, query);
  
  	ResetCancelConn();
--- 464,469 ----
*** a/src/bin/psql/common.h
--- b/src/bin/psql/common.h
***************
*** 38,44 **** extern void setup_cancel_handler(void);
  extern void SetCancelConn(void);
  extern void ResetCancelConn(void);
  
! extern PGresult *PSQLexec(const char *query, bool start_xact);
  extern int PSQLexecWatch(const char *query, const printQueryOpt *opt);
  
  extern bool SendQuery(const char *query);
--- 38,44 ----
  extern void SetCancelConn(void);
  extern void ResetCancelConn(void);
  
! extern PGresult *PSQLexec(const char *query);
  extern int PSQLexecWatch(const char *query, const printQueryOpt *opt);
  
  extern bool SendQuery(const char *query);
*** a/src/bin/psql/describe.c
--- b/src/bin/psql/describe.c
***************
*** 114,120 **** describeAggregates(const char *pattern, bool verbose, bool showSystem)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2, 4;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 114,120 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2, 4;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 195,201 **** describeTablespaces(const char *pattern, bool verbose)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 195,201 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 458,464 **** describeFunctions(const char *functypes, const char *pattern, bool verbose, bool
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2, 4;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 458,464 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2, 4;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 570,576 **** describeTypes(const char *pattern, bool verbose, bool showSystem)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 570,576 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 645,651 **** describeOperators(const char *pattern, bool verbose, bool showSystem)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2, 3, 4;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 645,651 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2, 3, 4;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 716,722 **** listAllDbs(const char *pattern, bool verbose)
  							  NULL, "d.datname", NULL, NULL);
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1;");
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 716,722 ----
  							  NULL, "d.datname", NULL, NULL);
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1;");
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 796,802 **** permissionsList(const char *pattern)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data, false);
  	if (!res)
  	{
  		termPQExpBuffer(&buf);
--- 796,802 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data);
  	if (!res)
  	{
  		termPQExpBuffer(&buf);
***************
*** 870,876 **** listDefaultACLs(const char *pattern)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2, 3;");
  
! 	res = PSQLexec(buf.data, false);
  	if (!res)
  	{
  		termPQExpBuffer(&buf);
--- 870,876 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2, 3;");
  
! 	res = PSQLexec(buf.data);
  	if (!res)
  	{
  		termPQExpBuffer(&buf);
***************
*** 1046,1052 **** objectDescription(const char *pattern, bool showSystem)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2, 3;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 1046,1052 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2, 3;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 1098,1104 **** describeTableDetails(const char *pattern, bool verbose, bool showSystem)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 2, 3;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 1098,1104 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 2, 3;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 1289,1295 **** describeOneTableDetails(const char *schemaname,
  						  oid);
  	}
  
! 	res = PSQLexec(buf.data, false);
  	if (!res)
  		goto error_return;
  
--- 1289,1295 ----
  						  oid);
  	}
  
! 	res = PSQLexec(buf.data);
  	if (!res)
  		goto error_return;
  
***************
*** 1331,1337 **** describeOneTableDetails(const char *schemaname,
  		/* must be separate because fmtId isn't reentrant */
  		appendPQExpBuffer(&buf, ".%s;", fmtId(relationname));
  
! 		res = PSQLexec(buf.data, false);
  		if (!res)
  			goto error_return;
  
--- 1331,1337 ----
  		/* must be separate because fmtId isn't reentrant */
  		appendPQExpBuffer(&buf, ".%s;", fmtId(relationname));
  
! 		res = PSQLexec(buf.data);
  		if (!res)
  			goto error_return;
  
***************
*** 1391,1397 **** describeOneTableDetails(const char *schemaname,
  	appendPQExpBuffer(&buf, "\nWHERE a.attrelid = '%s' AND a.attnum > 0 AND NOT a.attisdropped", oid);
  	appendPQExpBufferStr(&buf, "\nORDER BY a.attnum;");
  
! 	res = PSQLexec(buf.data, false);
  	if (!res)
  		goto error_return;
  	numrows = PQntuples(res);
--- 1391,1397 ----
  	appendPQExpBuffer(&buf, "\nWHERE a.attrelid = '%s' AND a.attnum > 0 AND NOT a.attisdropped", oid);
  	appendPQExpBufferStr(&buf, "\nORDER BY a.attnum;");
  
! 	res = PSQLexec(buf.data);
  	if (!res)
  		goto error_return;
  	numrows = PQntuples(res);
***************
*** 1505,1511 **** describeOneTableDetails(const char *schemaname,
  		printfPQExpBuffer(&buf,
  			 "SELECT pg_catalog.pg_get_viewdef('%s'::pg_catalog.oid, true);",
  						  oid);
! 		result = PSQLexec(buf.data, false);
  		if (!result)
  			goto error_return;
  
--- 1505,1511 ----
  		printfPQExpBuffer(&buf,
  			 "SELECT pg_catalog.pg_get_viewdef('%s'::pg_catalog.oid, true);",
  						  oid);
! 		result = PSQLexec(buf.data);
  		if (!result)
  			goto error_return;
  
***************
*** 1644,1650 **** describeOneTableDetails(const char *schemaname,
  						  "AND i.indrelid = c2.oid;",
  						  oid);
  
! 		result = PSQLexec(buf.data, false);
  		if (!result)
  			goto error_return;
  		else if (PQntuples(result) != 1)
--- 1644,1650 ----
  						  "AND i.indrelid = c2.oid;",
  						  oid);
  
! 		result = PSQLexec(buf.data);
  		if (!result)
  			goto error_return;
  		else if (PQntuples(result) != 1)
***************
*** 1723,1729 **** describeOneTableDetails(const char *schemaname,
  						  "\n AND d.deptype='a'",
  						  oid);
  
! 		result = PSQLexec(buf.data, false);
  		if (!result)
  			goto error_return;
  		else if (PQntuples(result) == 1)
--- 1723,1729 ----
  						  "\n AND d.deptype='a'",
  						  oid);
  
! 		result = PSQLexec(buf.data);
  		if (!result)
  			goto error_return;
  		else if (PQntuples(result) == 1)
***************
*** 1780,1786 **** describeOneTableDetails(const char *schemaname,
  							  "WHERE c.oid = '%s' AND c.oid = i.indrelid AND i.indexrelid = c2.oid\n"
  			 "ORDER BY i.indisprimary DESC, i.indisunique DESC, c2.relname;",
  							  oid);
! 			result = PSQLexec(buf.data, false);
  			if (!result)
  				goto error_return;
  			else
--- 1780,1786 ----
  							  "WHERE c.oid = '%s' AND c.oid = i.indrelid AND i.indexrelid = c2.oid\n"
  			 "ORDER BY i.indisprimary DESC, i.indisunique DESC, c2.relname;",
  							  oid);
! 			result = PSQLexec(buf.data);
  			if (!result)
  				goto error_return;
  			else
***************
*** 1864,1870 **** describeOneTableDetails(const char *schemaname,
  							  "WHERE r.conrelid = '%s' AND r.contype = 'c'\n"
  							  "ORDER BY 1;",
  							  oid);
! 			result = PSQLexec(buf.data, false);
  			if (!result)
  				goto error_return;
  			else
--- 1864,1870 ----
  							  "WHERE r.conrelid = '%s' AND r.contype = 'c'\n"
  							  "ORDER BY 1;",
  							  oid);
! 			result = PSQLexec(buf.data);
  			if (!result)
  				goto error_return;
  			else
***************
*** 1895,1901 **** describeOneTableDetails(const char *schemaname,
  							  "FROM pg_catalog.pg_constraint r\n"
  				   "WHERE r.conrelid = '%s' AND r.contype = 'f' ORDER BY 1;",
  							  oid);
! 			result = PSQLexec(buf.data, false);
  			if (!result)
  				goto error_return;
  			else
--- 1895,1901 ----
  							  "FROM pg_catalog.pg_constraint r\n"
  				   "WHERE r.conrelid = '%s' AND r.contype = 'f' ORDER BY 1;",
  							  oid);
! 			result = PSQLexec(buf.data);
  			if (!result)
  				goto error_return;
  			else
***************
*** 1926,1932 **** describeOneTableDetails(const char *schemaname,
  							  "FROM pg_catalog.pg_constraint c\n"
  				  "WHERE c.confrelid = '%s' AND c.contype = 'f' ORDER BY 1;",
  							  oid);
! 			result = PSQLexec(buf.data, false);
  			if (!result)
  				goto error_return;
  			else
--- 1926,1932 ----
  							  "FROM pg_catalog.pg_constraint c\n"
  				  "WHERE c.confrelid = '%s' AND c.contype = 'f' ORDER BY 1;",
  							  oid);
! 			result = PSQLexec(buf.data);
  			if (!result)
  				goto error_return;
  			else
***************
*** 1969,1975 **** describeOneTableDetails(const char *schemaname,
  								  "WHERE r.ev_class = '%s' ORDER BY 1;",
  								  oid);
  			}
! 			result = PSQLexec(buf.data, false);
  			if (!result)
  				goto error_return;
  			else
--- 1969,1975 ----
  								  "WHERE r.ev_class = '%s' ORDER BY 1;",
  								  oid);
  			}
! 			result = PSQLexec(buf.data);
  			if (!result)
  				goto error_return;
  			else
***************
*** 2060,2066 **** describeOneTableDetails(const char *schemaname,
  							  "FROM pg_catalog.pg_rewrite r\n"
  			"WHERE r.ev_class = '%s' AND r.rulename != '_RETURN' ORDER BY 1;",
  							  oid);
! 			result = PSQLexec(buf.data, false);
  			if (!result)
  				goto error_return;
  
--- 2060,2066 ----
  							  "FROM pg_catalog.pg_rewrite r\n"
  			"WHERE r.ev_class = '%s' AND r.rulename != '_RETURN' ORDER BY 1;",
  							  oid);
! 			result = PSQLexec(buf.data);
  			if (!result)
  				goto error_return;
  
***************
*** 2117,2123 **** describeOneTableDetails(const char *schemaname,
  								 "   WHERE d.classid = t.tableoid AND d.objid = t.oid AND d.deptype = 'i' AND c.contype = 'f'))");
  		appendPQExpBufferStr(&buf, "\nORDER BY 1;");
  
! 		result = PSQLexec(buf.data, false);
  		if (!result)
  			goto error_return;
  		else
--- 2117,2123 ----
  								 "   WHERE d.classid = t.tableoid AND d.objid = t.oid AND d.deptype = 'i' AND c.contype = 'f'))");
  		appendPQExpBufferStr(&buf, "\nORDER BY 1;");
  
! 		result = PSQLexec(buf.data);
  		if (!result)
  			goto error_return;
  		else
***************
*** 2246,2252 **** describeOneTableDetails(const char *schemaname,
  							  "     pg_catalog.pg_foreign_server s\n"
  							  "WHERE f.ftrelid = %s AND s.oid = f.ftserver;",
  							  oid);
! 			result = PSQLexec(buf.data, false);
  			if (!result)
  				goto error_return;
  			else if (PQntuples(result) != 1)
--- 2246,2252 ----
  							  "     pg_catalog.pg_foreign_server s\n"
  							  "WHERE f.ftrelid = %s AND s.oid = f.ftserver;",
  							  oid);
! 			result = PSQLexec(buf.data);
  			if (!result)
  				goto error_return;
  			else if (PQntuples(result) != 1)
***************
*** 2273,2279 **** describeOneTableDetails(const char *schemaname,
  		/* print inherited tables */
  		printfPQExpBuffer(&buf, "SELECT c.oid::pg_catalog.regclass FROM pg_catalog.pg_class c, pg_catalog.pg_inherits i WHERE c.oid=i.inhparent AND i.inhrelid = '%s' ORDER BY inhseqno;", oid);
  
! 		result = PSQLexec(buf.data, false);
  		if (!result)
  			goto error_return;
  		else
--- 2273,2279 ----
  		/* print inherited tables */
  		printfPQExpBuffer(&buf, "SELECT c.oid::pg_catalog.regclass FROM pg_catalog.pg_class c, pg_catalog.pg_inherits i WHERE c.oid=i.inhparent AND i.inhrelid = '%s' ORDER BY inhseqno;", oid);
  
! 		result = PSQLexec(buf.data);
  		if (!result)
  			goto error_return;
  		else
***************
*** 2306,2312 **** describeOneTableDetails(const char *schemaname,
  		else
  			printfPQExpBuffer(&buf, "SELECT c.oid::pg_catalog.regclass FROM pg_catalog.pg_class c, pg_catalog.pg_inherits i WHERE c.oid=i.inhrelid AND i.inhparent = '%s' ORDER BY c.relname;", oid);
  
! 		result = PSQLexec(buf.data, false);
  		if (!result)
  			goto error_return;
  		else
--- 2306,2312 ----
  		else
  			printfPQExpBuffer(&buf, "SELECT c.oid::pg_catalog.regclass FROM pg_catalog.pg_class c, pg_catalog.pg_inherits i WHERE c.oid=i.inhrelid AND i.inhparent = '%s' ORDER BY c.relname;", oid);
  
! 		result = PSQLexec(buf.data);
  		if (!result)
  			goto error_return;
  		else
***************
*** 2453,2459 **** add_tablespace_footer(printTableContent *const cont, char relkind,
  			printfPQExpBuffer(&buf,
  							  "SELECT spcname FROM pg_catalog.pg_tablespace\n"
  							  "WHERE oid = '%u';", tablespace);
! 			result = PSQLexec(buf.data, false);
  			if (!result)
  				return;
  			/* Should always be the case, but.... */
--- 2453,2459 ----
  			printfPQExpBuffer(&buf,
  							  "SELECT spcname FROM pg_catalog.pg_tablespace\n"
  							  "WHERE oid = '%u';", tablespace);
! 			result = PSQLexec(buf.data);
  			if (!result)
  				return;
  			/* Should always be the case, but.... */
***************
*** 2552,2558 **** describeRoles(const char *pattern, bool verbose)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1;");
  
! 	res = PSQLexec(buf.data, false);
  	if (!res)
  		return false;
  
--- 2552,2558 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1;");
  
! 	res = PSQLexec(buf.data);
  	if (!res)
  		return false;
  
***************
*** 2683,2689 **** listDbRoleSettings(const char *pattern, const char *pattern2)
  		return false;
  	}
  
! 	res = PSQLexec(buf.data, false);
  	if (!res)
  		return false;
  
--- 2683,2689 ----
  		return false;
  	}
  
! 	res = PSQLexec(buf.data);
  	if (!res)
  		return false;
  
***************
*** 2844,2850 **** listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSys
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1,2;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 2844,2850 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1,2;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 2931,2937 **** listLanguages(const char *pattern, bool verbose, bool showSystem)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 2931,2937 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 3018,3024 **** listDomains(const char *pattern, bool verbose, bool showSystem)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 3018,3024 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 3092,3098 **** listConversions(const char *pattern, bool verbose, bool showSystem)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 3092,3098 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 3158,3164 **** listEventTriggers(const char *pattern, bool verbose)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 3158,3164 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 3257,3263 **** listCasts(const char *pattern, bool verbose)
  
  	appendPQExpBufferStr(&buf, ") )\nORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 3257,3263 ----
  
  	appendPQExpBufferStr(&buf, ") )\nORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 3333,3339 **** listCollations(const char *pattern, bool verbose, bool showSystem)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 3333,3339 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 3392,3398 **** listSchemas(const char *pattern, bool verbose, bool showSystem)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 3392,3398 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 3449,3455 **** listTSParsers(const char *pattern, bool verbose)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 3449,3455 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 3490,3496 **** listTSParsersVerbose(const char *pattern)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 3490,3496 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 3587,3593 **** describeOneTSParser(const char *oid, const char *nspname, const char *prsname)
  					  gettext_noop("Get token types"),
  					  oid);
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 3587,3593 ----
  					  gettext_noop("Get token types"),
  					  oid);
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 3619,3625 **** describeOneTSParser(const char *oid, const char *nspname, const char *prsname)
  					  gettext_noop("Description"),
  					  oid);
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 3619,3625 ----
  					  gettext_noop("Description"),
  					  oid);
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 3695,3701 **** listTSDictionaries(const char *pattern, bool verbose)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 3695,3701 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 3763,3769 **** listTSTemplates(const char *pattern, bool verbose)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 3763,3769 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 3820,3826 **** listTSConfigs(const char *pattern, bool verbose)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 3820,3826 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 3862,3868 **** listTSConfigsVerbose(const char *pattern)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 3, 2;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 3862,3868 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 3, 2;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 3940,3946 **** describeOneTSConfig(const char *oid, const char *nspname, const char *cfgname,
  					  gettext_noop("Dictionaries"),
  					  oid);
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 3940,3946 ----
  					  gettext_noop("Dictionaries"),
  					  oid);
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 4041,4047 **** listForeignDataWrappers(const char *pattern, bool verbose)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 4041,4047 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 4120,4126 **** listForeignServers(const char *pattern, bool verbose)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 4120,4126 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 4178,4184 **** listUserMappings(const char *pattern, bool verbose)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 4178,4184 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 4252,4258 **** listForeignTables(const char *pattern, bool verbose)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 4252,4258 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 4306,4312 **** listExtensions(const char *pattern)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 4306,4312 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 4352,4358 **** listExtensionContents(const char *pattern)
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1;");
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 4352,4358 ----
  
  	appendPQExpBufferStr(&buf, "ORDER BY 1;");
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
***************
*** 4412,4418 **** listOneExtensionContents(const char *extname, const char *oid)
  					  gettext_noop("Object Description"),
  					  oid);
  
! 	res = PSQLexec(buf.data, false);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
--- 4412,4418 ----
  					  gettext_noop("Object Description"),
  					  oid);
  
! 	res = PSQLexec(buf.data);
  	termPQExpBuffer(&buf);
  	if (!res)
  		return false;
*** a/src/bin/psql/large_obj.c
--- b/src/bin/psql/large_obj.c
***************
*** 73,79 **** start_lo_xact(const char *operation, bool *own_transaction)
  	{
  		case PQTRANS_IDLE:
  			/* need to start our own xact */
! 			if (!(res = PSQLexec("BEGIN", false)))
  				return false;
  			PQclear(res);
  			*own_transaction = true;
--- 73,79 ----
  	{
  		case PQTRANS_IDLE:
  			/* need to start our own xact */
! 			if (!(res = PSQLexec("BEGIN")))
  				return false;
  			PQclear(res);
  			*own_transaction = true;
***************
*** 103,111 **** finish_lo_xact(const char *operation, bool own_transaction)
  	if (own_transaction && pset.autocommit)
  	{
  		/* close out our own xact */
! 		if (!(res = PSQLexec("COMMIT", false)))
  		{
! 			res = PSQLexec("ROLLBACK", false);
  			PQclear(res);
  			return false;
  		}
--- 103,111 ----
  	if (own_transaction && pset.autocommit)
  	{
  		/* close out our own xact */
! 		if (!(res = PSQLexec("COMMIT")))
  		{
! 			res = PSQLexec("ROLLBACK");
  			PQclear(res);
  			return false;
  		}
***************
*** 126,132 **** fail_lo_xact(const char *operation, bool own_transaction)
  	if (own_transaction && pset.autocommit)
  	{
  		/* close out our own xact */
! 		res = PSQLexec("ROLLBACK", false);
  		PQclear(res);
  	}
  
--- 126,132 ----
  	if (own_transaction && pset.autocommit)
  	{
  		/* close out our own xact */
! 		res = PSQLexec("ROLLBACK");
  		PQclear(res);
  	}
  
***************
*** 209,215 **** do_lo_import(const char *filename_arg, const char *comment_arg)
  		bufptr += PQescapeStringConn(pset.db, bufptr, comment_arg, slen, NULL);
  		strcpy(bufptr, "'");
  
! 		if (!(res = PSQLexec(cmdbuf, false)))
  		{
  			free(cmdbuf);
  			return fail_lo_xact("\\lo_import", own_transaction);
--- 209,215 ----
  		bufptr += PQescapeStringConn(pset.db, bufptr, comment_arg, slen, NULL);
  		strcpy(bufptr, "'");
  
! 		if (!(res = PSQLexec(cmdbuf)))
  		{
  			free(cmdbuf);
  			return fail_lo_xact("\\lo_import", own_transaction);
***************
*** 301,307 **** do_lo_list(void)
  				 gettext_noop("Description"));
  	}
  
! 	res = PSQLexec(buf, false);
  	if (!res)
  		return false;
  
--- 301,307 ----
  				 gettext_noop("Description"));
  	}
  
! 	res = PSQLexec(buf);
  	if (!res)
  		return false;