Minor fixes for psql tab completion. Spell "absolute" like the English word,

Neil Conway · Neil Conway · commit 8bbe905a2ed1 · 2005-04-04T07:19:44.000Z
not the brand of vodka. Complete FETCH &lt;sth&gt; &lt;sth&gt; with FROM and IN, not
FROM and TO (which is still pretty incomplete, but at least its the right
syntax).
diff --git 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.122 2005/03/19 23:27:08 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.123 2005/04/04 07:19:44 neilc Exp $
  */
 
 /*----------------------------------------------------------------------
@@ -1186,7 +1186,7 @@ psql_completion(char *text, int start, int end)
 			 pg_strcasecmp(prev_wd, "MOVE") == 0)
 	{
 		static const char *const list_FETCH1[] =
-		{"ABSOLUT", "BACKWARD", "FORWARD", "RELATIVE", NULL};
+		{"ABSOLUTE", "BACKWARD", "FORWARD", "RELATIVE", NULL};
 
 		COMPLETE_WITH_LIST(list_FETCH1);
 	}
@@ -1201,16 +1201,17 @@ psql_completion(char *text, int start, int end)
 	}
 
 	/*
-	 * Complete FETCH <sth1> <sth2> with "FROM" or "TO". (Is there a
-	 * difference? If not, remove one.)
+	 * Complete FETCH <sth1> <sth2> with "FROM" or "IN". These are
+	 * equivalent, but we may as well tab-complete both: perhaps some
+	 * users prefer one variant or the other.
 	 */
 	else if (pg_strcasecmp(prev3_wd, "FETCH") == 0 ||
 			 pg_strcasecmp(prev3_wd, "MOVE") == 0)
 	{
-		static const char *const list_FROMTO[] =
-		{"FROM", "TO", NULL};
+		static const char *const list_FROMIN[] =
+		{"FROM", "IN", NULL};
 
-		COMPLETE_WITH_LIST(list_FROMTO);
+		COMPLETE_WITH_LIST(list_FROMIN);
 	}
 
 /* GRANT && REVOKE*/

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2005, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.122 2005/03/19 23:27:08 tgl Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.123 2005/04/04 07:19:44 neilc Exp $`
`7`	`7`	`*/`
`8`	`8`
`9`	`9`	`/*----------------------------------------------------------------------`
`@@ -1186,7 +1186,7 @@ psql_completion(char *text, int start, int end)`
`1186`	`1186`	`pg_strcasecmp(prev_wd, "MOVE") == 0)`
`1187`	`1187`	`{`
`1188`	`1188`	`static const char *const list_FETCH1[] =`
`1189`		`- {"ABSOLUT", "BACKWARD", "FORWARD", "RELATIVE", NULL};`
	`1189`	`+ {"ABSOLUTE", "BACKWARD", "FORWARD", "RELATIVE", NULL};`
`1190`	`1190`
`1191`	`1191`	`COMPLETE_WITH_LIST(list_FETCH1);`
`1192`	`1192`	`}`
`@@ -1201,16 +1201,17 @@ psql_completion(char *text, int start, int end)`
`1201`	`1201`	`}`
`1202`	`1202`
`1203`	`1203`	`/*`
`1204`		`- * Complete FETCH <sth1> <sth2> with "FROM" or "TO". (Is there a`
`1205`		`- * difference? If not, remove one.)`
	`1204`	`+ * Complete FETCH <sth1> <sth2> with "FROM" or "IN". These are`
	`1205`	`+ * equivalent, but we may as well tab-complete both: perhaps some`
	`1206`	`+ * users prefer one variant or the other.`
`1206`	`1207`	`*/`
`1207`	`1208`	`else if (pg_strcasecmp(prev3_wd, "FETCH") == 0 \|\|`
`1208`	`1209`	`pg_strcasecmp(prev3_wd, "MOVE") == 0)`
`1209`	`1210`	`{`
`1210`		`- static const char *const list_FROMTO[] =`
`1211`		`- {"FROM", "TO", NULL};`
	`1211`	`+ static const char *const list_FROMIN[] =`
	`1212`	`+ {"FROM", "IN", NULL};`
`1212`	`1213`
`1213`		`- COMPLETE_WITH_LIST(list_FROMTO);`
	`1214`	`+ COMPLETE_WITH_LIST(list_FROMIN);`
`1214`	`1215`	`}`
`1215`	`1216`
`1216`	`1217`	`/* GRANT && REVOKE*/`