From ae7c9262bf0e5960e85fa2284461ecaedf5b954a Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Tue, 15 Nov 2011 20:34:47 -0500 Subject: [PATCH] Don't elide blank lines when accumulating psql command history. This can change the meaning of queries, if the blank line happens to occur in the middle of a quoted literal, as per complaint from Tomas Vondra. Back-patch to all supported branches. --- src/bin/psql/input.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c index d17c9abb95a..829f2296821 100644 --- a/src/bin/psql/input.c +++ b/src/bin/psql/input.c @@ -86,10 +86,10 @@ void pg_append_history(const char *s, PQExpBuffer history_buf) { #ifdef USE_READLINE - if (useHistory && s && s[0]) + if (useHistory && s) { appendPQExpBufferStr(history_buf, s); - if (s[strlen(s) - 1] != '\n') + if (!s[0] || s[strlen(s) - 1] != '\n') appendPQExpBufferChar(history_buf, '\n'); } #endif