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

hlinnaka · hlinnaka · commit c1dcaa86ded9 · 2009-03-27T14:58:46.000Z
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
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.180 2009/02/24 10:06:34 petere Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.181 2009/03/27 14:58:46 heikki Exp $
  */
 
 /*----------------------------------------------------------------------
@@ -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};

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2009, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.180 2009/02/24 10:06:34 petere Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.181 2009/03/27 14:58:46 heikki Exp $`
`7`	`7`	`*/`
`8`	`8`
`9`	`9`	`/*----------------------------------------------------------------------`
`@@ -1624,11 +1624,11 @@ psql_completion(char *text, int start, int end)`
`1624`	`1624`
`1625`	`1625`	`COMPLETE_WITH_LIST(list_EXPLAIN);`
`1626`	`1626`	`}`
`1627`		`- else if (pg_strcasecmp(prev_wd, "VERBOSE") == 0 &&`
`1628`		`- pg_strcasecmp(prev3_wd, "VACUUM") != 0 &&`
`1629`		`- pg_strcasecmp(prev4_wd, "VACUUM") != 0 &&`
`1630`		`- (pg_strcasecmp(prev2_wd, "ANALYZE") == 0 \|\|`
`1631`		`- pg_strcasecmp(prev2_wd, "EXPLAIN") == 0))`
	`1627`	`+ else if ((pg_strcasecmp(prev2_wd, "EXPLAIN") == 0 &&`
	`1628`	`+ pg_strcasecmp(prev_wd, "VERBOSE") == 0) \|\|`
	`1629`	`+ (pg_strcasecmp(prev3_wd, "EXPLAIN") == 0 &&`
	`1630`	`+ pg_strcasecmp(prev2_wd, "ANALYZE") == 0 &&`
	`1631`	`+ pg_strcasecmp(prev_wd, "VERBOSE") == 0))`
`1632`	`1632`	`{`
`1633`	`1633`	`static const char *const list_EXPLAIN[] =`
`1634`	`1634`	`{"SELECT", "INSERT", "DELETE", "UPDATE", "DECLARE", NULL};`