Fix tab-completion for COPY and \copy options.

Commit c273d9d8ce4 reworked tab-completion of COPY and \copy in psql
and added support for completing options within WITH clauses. However,
the same COPY options were suggested for both COPY TO and COPY FROM
commands, even though some options are only valid for one or the
other.

This commit separates the COPY options for COPY FROM and COPY TO
commands to provide more accurate auto-completion suggestions.

Back-patch to v14 where tab-completion for COPY and \copy options
within WITH clauses was first supported.

Author: Atsushi Torikoshi <torikoshia@oss.nttdata.com>
Reviewed-by: Yugo Nagata <nagata@sraoss.co.jp>
Discussion: https://postgr.es/m/079e7a2c801f252ae8d522b772790ed7@oss.nttdata.com
Backpatch-through: 14

diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 5b909d6f3a045488ee5434b742ad7086ff56fedb..7e36cb1197382f37a24df842a7555210425dbcb1 100644 (file)
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -1022,6 +1022,18 @@ static const SchemaQuery Query_for_list_of_collations = {
 "   FROM pg_catalog.pg_cursors "\
 "  WHERE substring(pg_catalog.quote_ident(name),1,%d)='%s'"
 
+/* COPY options shared between FROM and TO */
+#define Copy_common_options \
+"DELIMITER", "ENCODING", "ESCAPE", "FORMAT", "HEADER", "NULL", "QUOTE"
+
+/* COPY FROM options */
+#define Copy_from_options \
+Copy_common_options, "FORCE_NOT_NULL", "FORCE_NULL", "FREEZE"
+
+/* COPY TO options */
+#define Copy_to_options \
+Copy_common_options, "FORCE_QUOTE"
+
 /*
  * These object types were introduced later than our support cutoff of
  * server version 7.4.  We use the VersionedQuery infrastructure so that
@@ -2447,11 +2459,13 @@ psql_completion(const char *text, int start, int end)
        else if (Matches("COPY|\\copy", MatchAny, "FROM", MatchAny))
                COMPLETE_WITH("WITH (", "WHERE");
 
-       /* Complete COPY <sth> FROM|TO filename WITH ( */
-       else if (Matches("COPY|\\copy", MatchAny, "FROM|TO", MatchAny, "WITH", "("))
-               COMPLETE_WITH("FORMAT", "FREEZE", "DELIMITER", "NULL",
-                                         "HEADER", "QUOTE", "ESCAPE", "FORCE_QUOTE",
-                                         "FORCE_NOT_NULL", "FORCE_NULL", "ENCODING");
+       /* Complete COPY <sth> FROM filename WITH ( */
+       else if (Matches("COPY|\\copy", MatchAny, "FROM", MatchAny, "WITH", "("))
+               COMPLETE_WITH(Copy_from_options);
+
+       /* Complete COPY <sth> TO filename WITH ( */
+       else if (Matches("COPY|\\copy", MatchAny, "TO", MatchAny, "WITH", "("))
+               COMPLETE_WITH(Copy_to_options);
 
        /* Complete COPY <sth> FROM|TO filename WITH (FORMAT */
        else if (Matches("COPY|\\copy", MatchAny, "FROM|TO", MatchAny, "WITH", "(", "FORMAT"))