Improve tab-completion for FETCH/MOVE.

Author: Naoki Nakamichi
Reviewed-by: Fujii Masao
Discussion: https://postgr.es/m/d05a46b599634ca0d94144387507f4b4@oss.nttdata.com

diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 24c7b414cf3a568adbb01f6bd17f0c8da3d69f28..561fe1dff93b60df27e3bd3ad47019473e7da72a 100644 (file)
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -3077,19 +3077,27 @@ psql_completion(const char *text, int start, int end)
        COMPLETE_WITH("SELECT", "INSERT", "DELETE", "UPDATE", "DECLARE");
 
 /* FETCH && MOVE */
-   /* Complete FETCH with one of FORWARD, BACKWARD, RELATIVE */
+
+   /*
+    * Complete FETCH with one of ABSOLUTE, BACKWARD, FORWARD, RELATIVE, ALL,
+    * NEXT, PRIOR, FIRST, LAST
+    */
    else if (Matches("FETCH|MOVE"))
-       COMPLETE_WITH("ABSOLUTE", "BACKWARD", "FORWARD", "RELATIVE");
-   /* Complete FETCH <sth> with one of ALL, NEXT, PRIOR */
-   else if (Matches("FETCH|MOVE", MatchAny))
-       COMPLETE_WITH("ALL", "NEXT", "PRIOR");
+       COMPLETE_WITH("ABSOLUTE", "BACKWARD", "FORWARD", "RELATIVE",
+                     "ALL", "NEXT", "PRIOR", "FIRST", "LAST");
+
+   /* Complete FETCH BACKWARD or FORWARD with one of ALL, FROM, IN */
+   else if (Matches("FETCH|MOVE", "BACKWARD|FORWARD"))
+       COMPLETE_WITH("ALL", "FROM", "IN");
 
    /*
-    * Complete FETCH <sth1> <sth2> with "FROM" or "IN". These are equivalent,
+    * Complete FETCH <direction> 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 (Matches("FETCH|MOVE", MatchAny, MatchAny))
+   else if (Matches("FETCH|MOVE", "ABSOLUTE|BACKWARD|FORWARD|RELATIVE",
+                    MatchAnyExcept("FROM|IN")) ||
+            Matches("FETCH|MOVE", "ALL|NEXT|PRIOR|FIRST|LAST"))
        COMPLETE_WITH("FROM", "IN");
 
 /* FOREIGN DATA WRAPPER */