Fix tab completion of ANALYZE VERBOSE <tab>. It was previously confused

with EXPLAIN ANALYZE VERBOSE.

Greg Sabino Mullane, reformatted by myself. Backpatch to 8.1, where the
bug was introduced.

diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 6241cfec0408ce3c10f45fee673c8bfe541fd5a0..8f6a808a8cdd6116ef960fa12d2f6d71b94d401c 100644 (file)
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -1624,11 +1624,11 @@ psql_completion(char *text, int start, int end)
 
                COMPLETE_WITH_LIST(list_EXPLAIN);
        }
-       else if (pg_strcasecmp(prev_wd, "VERBOSE") == 0 &&
-                        pg_strcasecmp(prev3_wd, "VACUUM") != 0 &&
-                        pg_strcasecmp(prev4_wd, "VACUUM") != 0 &&
-                        (pg_strcasecmp(prev2_wd, "ANALYZE") == 0 ||
-                         pg_strcasecmp(prev2_wd, "EXPLAIN") == 0))
+       else if ((pg_strcasecmp(prev2_wd, "EXPLAIN") == 0 &&
+                         pg_strcasecmp(prev_wd, "VERBOSE") == 0) ||
+                        (pg_strcasecmp(prev3_wd, "EXPLAIN") == 0 &&
+                         pg_strcasecmp(prev2_wd, "ANALYZE") == 0 &&
+                         pg_strcasecmp(prev_wd, "VERBOSE") == 0))
        {
                static const char *const list_EXPLAIN[] =
                {"SELECT", "INSERT", "DELETE", "UPDATE", "DECLARE", NULL};