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 d0dac3d070fabeba9b6d1bbc934df40d16ef3a8e..65a213e85dd1819ab54a16f41d82ae976f13370a 100644 (file)
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.138.2.1 2005/11/14 17:46:07 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.138.2.2 2009/03/27 14:59:46 heikki Exp $
  */
 
 /*----------------------------------------------------------------------
@@ -1248,11 +1248,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};