diff options
Diffstat (limited to 'src/bin/psql/tab-complete.c')
| -rw-r--r-- | src/bin/psql/tab-complete.c | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index 7c4933333b3..d917987fd58 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -45,7 +45,6 @@ #include "catalog/pg_am_d.h" #include "catalog/pg_class_d.h" -#include "catalog/pg_collation_d.h" #include "common.h" #include "libpq-fe.h" #include "pqexpbuffer.h" @@ -842,20 +841,6 @@ static const SchemaQuery Query_for_list_of_collations = { " (SELECT tgrelid FROM pg_catalog.pg_trigger "\ " WHERE pg_catalog.quote_ident(tgname)='%s')" -/* the silly-looking length condition is just to eat up the current word */ -#define Query_for_list_of_colls_for_one_index \ -" SELECT DISTINCT pg_catalog.quote_ident(coll.collname) " \ -" FROM pg_catalog.pg_depend d, pg_catalog.pg_collation coll, " \ -" pg_catalog.pg_class c" \ -" WHERE (%d = pg_catalog.length('%s'))" \ -" AND d.refclassid = " CppAsString2(CollationRelationId) \ -" AND d.refobjid = coll.oid " \ -" AND d.classid = " CppAsString2(RelationRelationId) \ -" AND d.objid = c.oid " \ -" AND c.relkind = " CppAsString2(RELKIND_INDEX) \ -" AND pg_catalog.pg_table_is_visible(c.oid) " \ -" AND c.relname = '%s'" - #define Query_for_list_of_ts_configurations \ "SELECT pg_catalog.quote_ident(cfgname) FROM pg_catalog.pg_ts_config "\ " WHERE substring(pg_catalog.quote_ident(cfgname),1,%d)='%s'" @@ -1769,15 +1754,14 @@ psql_completion(const char *text, int start, int end) else if (Matches("ALTER", "INDEX", MatchAny)) COMPLETE_WITH("ALTER COLUMN", "OWNER TO", "RENAME TO", "SET", "RESET", "ATTACH PARTITION", - "DEPENDS ON EXTENSION", "NO DEPENDS ON EXTENSION", - "ALTER COLLATION"); + "DEPENDS ON EXTENSION", "NO DEPENDS ON EXTENSION"); else if (Matches("ALTER", "INDEX", MatchAny, "ATTACH")) COMPLETE_WITH("PARTITION"); else if (Matches("ALTER", "INDEX", MatchAny, "ATTACH", "PARTITION")) COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_indexes, NULL); /* ALTER INDEX <name> ALTER */ else if (Matches("ALTER", "INDEX", MatchAny, "ALTER")) - COMPLETE_WITH("COLLATION", "COLUMN"); + COMPLETE_WITH("COLUMN"); /* ALTER INDEX <name> ALTER COLUMN */ else if (Matches("ALTER", "INDEX", MatchAny, "ALTER", "COLUMN")) { @@ -1816,15 +1800,10 @@ psql_completion(const char *text, int start, int end) "buffering =", /* GiST */ "pages_per_range =", "autosummarize =" /* BRIN */ ); - /* ALTER INDEX <name> ALTER COLLATION */ - else if (Matches("ALTER", "INDEX", MatchAny, "ALTER", "COLLATION")) - { - completion_info_charp = prev3_wd; - COMPLETE_WITH_QUERY(Query_for_list_of_colls_for_one_index); - } - /* ALTER INDEX <name> ALTER COLLATION <name> */ - else if (Matches("ALTER", "INDEX", MatchAny, "ALTER", "COLLATION", MatchAny)) - COMPLETE_WITH("REFRESH VERSION"); + else if (Matches("ALTER", "INDEX", MatchAny, "NO", "DEPENDS")) + COMPLETE_WITH("ON EXTENSION"); + else if (Matches("ALTER", "INDEX", MatchAny, "DEPENDS")) + COMPLETE_WITH("ON EXTENSION"); /* ALTER LANGUAGE <name> */ else if (Matches("ALTER", "LANGUAGE", MatchAny)) |