From 5ebc210b689abc636e34d7f45f804299a7a1002e Mon Sep 17 00:00:00 2001 From: Kyotaro Horiguchi Date: Mon, 28 Nov 2016 17:21:29 +0900 Subject: [PATCH 07/12] Simplify completion for COPY. Simplify completion for COPY command by removing BINARY. --- src/bin/psql/tab-complete.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index 76010b4..2414f47 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -1734,39 +1734,38 @@ psql_completion_internal(const char *text, char **previous_words, /* COPY */ /* + * Just ignore obsolte styled BINARY if exists. + */ + HeadMatchAndRemove2(2, 1, "COPY", "BINARY"); + /* * If we have COPY, offer list of tables or "(" (Also cover the analogous * backslash command). */ if (Matches1("COPY|\\copy")) COMPLETE_WITH_SCHEMA_QUERY_KW(Query_for_list_of_tables, ADDLIST1("(")); - /* If we have COPY BINARY, complete with list of tables */ - if (Matches2("COPY", "BINARY")) - COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables); + /* Don't suggest BINARY just after COPY. It is obsolete. */ + /* If we have COPY (, complete it with legal commands */ if (Matches2("COPY|\\copy", "(")) COMPLETE_WITH_LIST7("SELECT", "TABLE", "VALUES", "INSERT", "UPDATE", "DELETE", "WITH"); /* If we have COPY [BINARY] , complete it with "TO" or "FROM" */ - if (Matches2("COPY|\\copy", MatchAny) || - Matches3("COPY", "BINARY", MatchAny)) + if (Matches2("COPY|\\copy", MatchAny)) COMPLETE_WITH_LIST2("FROM", "TO"); /* If we have COPY [BINARY] FROM|TO, complete with filename */ - if (Matches3("COPY|\\copy", MatchAny, "FROM|TO") || - Matches4("COPY", "BINARY", MatchAny, "FROM|TO")) + if (Matches3("COPY|\\copy", MatchAny, "FROM|TO")) { SET_COMP_CHARP(""); return completion_matches(text, complete_from_files); } /* Handle COPY [BINARY] FROM|TO filename */ - if (Matches4("COPY|\\copy", MatchAny, "FROM|TO", MatchAny) || - Matches5("COPY", "BINARY", MatchAny, "FROM|TO", MatchAny)) + if (Matches4("COPY|\\copy", MatchAny, "FROM|TO", MatchAny)) COMPLETE_WITH_LIST6("BINARY", "OIDS", "DELIMITER", "NULL", "CSV", "ENCODING"); /* Handle COPY [BINARY] FROM|TO filename CSV */ - if (Matches5("COPY|\\copy", MatchAny, "FROM|TO", MatchAny, "CSV") || - Matches6("COPY", "BINARY", MatchAny, "FROM|TO", MatchAny, "CSV")) + if (Matches5("COPY|\\copy", MatchAny, "FROM|TO", MatchAny, "CSV")) COMPLETE_WITH_LIST5("HEADER", "QUOTE", "ESCAPE", "FORCE QUOTE", "FORCE NOT NULL"); -- 2.9.2