#ifdef out some dead code in psql/mainloop.c.

This pg_send_history() call is unreachable, since the block it's in
is currently only entered in !cur_cmd_interactive mode.  But rather
than just delete it, make it #ifdef NOT_USED, in hopes that we'll
remember to enable it if we ever change that decision.

Per report from David Binderman.  Since this is basically cosmetic,
I see no great need to back-patch.

Discussion: https://postgr.es/m/HE1PR0802MB233122B61F00A15E035C83BE9C710@HE1PR0802MB2331.eurprd08.prod.outlook.com

diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
index 0162ee8d2f585390537dabadd28a25365df6bdf1..62cf1f404a600d2c94146b7e5b08712ecb1ac731 100644 (file)
--- a/src/bin/psql/mainloop.c
+++ b/src/bin/psql/mainloop.c
@@ -456,14 +456,19 @@ MainLoop(FILE *source)
        }                                                       /* while !endoffile/session */
 
        /*
-        * Process query at the end of file without a semicolon
+        * If we have a non-semicolon-terminated query at the end of file, we
+        * process it unless the input source is interactive --- in that case it
+        * seems better to go ahead and quit.  Also skip if this is an error exit.
         */
        if (query_buf->len > 0 && !pset.cur_cmd_interactive &&
                successResult == EXIT_SUCCESS)
        {
                /* save query in history */
+               /* currently unneeded since we don't use this block if interactive */
+#ifdef NOT_USED
                if (pset.cur_cmd_interactive)
                        pg_send_history(history_buf);
+#endif
 
                /* execute query unless we're in an inactive \if branch */
                if (conditional_active(cond_stack))