Cause psql to report both the returned data and the command status tag

[postgresql] / src / bin / psql / common.c

diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 9b905295782fb466736e0e9167396a5e3ef2d10b..3233dfc2faeaf48fb5b360c3832172c16dfaab68 100644 (file)
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2006, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.121 2006/06/30 16:55:35 alvherre Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.124 2006/08/13 21:10:04 tgl Exp $
  */
 #include "postgres_fe.h"
 #include "common.h"
@@ -22,16 +22,11 @@
 #include <sys/timeb.h>                 /* for _ftime() */
 #endif
 
-#include "libpq-fe.h"
 #include "pqsignal.h"
 
 #include "settings.h"
-#include "variables.h"
 #include "command.h"
 #include "copy.h"
-#include "prompt.h"
-#include "print.h"
-#include "mainloop.h"
 #include "mb/pg_wchar.h"
 
 
@@ -193,7 +188,7 @@ psql_error(const char *fmt,...)
                fflush(pset.queryFout);
 
        if (pset.inputfile)
-               fprintf(stderr, "%s:%s:%u: ", pset.progname, pset.inputfile, pset.lineno);
+               fprintf(stderr, "%s:%s:" UINT64_FORMAT ": ", pset.progname, pset.inputfile, pset.lineno);
        va_start(ap, fmt);
        vfprintf(stderr, _(fmt), ap);
        va_end(ap);
@@ -688,6 +683,36 @@ ProcessCopyResult(PGresult *results)
 }
 
 
+/*
+ * PrintQueryStatus: report command status as required
+ *
+ * Note: Utility function for use by PrintQueryResults() only.
+ */
+static void
+PrintQueryStatus(PGresult *results)
+{
+       char            buf[16];
+
+       if (!QUIET())
+       {
+               if (pset.popt.topt.format == PRINT_HTML)
+               {
+                       fputs("<p>", pset.queryFout);
+                       html_escaped_print(PQcmdStatus(results), pset.queryFout);
+                       fputs("</p>\n", pset.queryFout);
+               }
+               else
+                       fprintf(pset.queryFout, "%s\n", PQcmdStatus(results));
+       }
+
+       if (pset.logfile)
+               fprintf(pset.logfile, "%s\n", PQcmdStatus(results));
+
+       snprintf(buf, sizeof(buf), "%u", (unsigned int) PQoidValue(results));
+       SetVariable(pset.vars, "LASTOID", buf);
+}
+
+
 /*
  * PrintQueryResults: print out query results as required
  *
@@ -699,6 +724,7 @@ static bool
 PrintQueryResults(PGresult *results)
 {
        bool            success = false;
+       const char *cmdstatus;
 
        if (!results)
                return false;
@@ -706,33 +732,20 @@ PrintQueryResults(PGresult *results)
        switch (PQresultStatus(results))
        {
                case PGRES_TUPLES_OK:
+                       /* print the data ... */
                        success = PrintQueryTuples(results);
+                       /* if it's INSERT/UPDATE/DELETE RETURNING, also print status */
+                       cmdstatus = PQcmdStatus(results);
+                       if (strncmp(cmdstatus, "INSERT", 6) == 0 ||
+                               strncmp(cmdstatus, "UPDATE", 6) == 0 ||
+                               strncmp(cmdstatus, "DELETE", 6) == 0)
+                               PrintQueryStatus(results);
                        break;
 
                case PGRES_COMMAND_OK:
-                       {
-                               char            buf[10];
-
-                               success = true;
-                               snprintf(buf, sizeof(buf),
-                                                "%u", (unsigned int) PQoidValue(results));
-                               if (!QUIET())
-                               {
-                                       if (pset.popt.topt.format == PRINT_HTML)
-                                       {
-                                               fputs("<p>", pset.queryFout);
-                                               html_escaped_print(PQcmdStatus(results),
-                                                                                  pset.queryFout);
-                                               fputs("</p>\n", pset.queryFout);
-                                       }
-                                       else
-                                               fprintf(pset.queryFout, "%s\n", PQcmdStatus(results));
-                               }
-                               if (pset.logfile)
-                                       fprintf(pset.logfile, "%s\n", PQcmdStatus(results));
-                               SetVariable(pset.vars, "LASTOID", buf);
-                               break;
-                       }
+                       PrintQueryStatus(results);
+                       success = true;
+                       break;
 
                case PGRES_EMPTY_QUERY:
                        success = true;