@@ -1276,7 +1276,7 @@ psql_completion(const char *text, int start, int end)
12761276static const char * const backslash_commands []= {
12771277"\\a" ,"\\connect" ,"\\conninfo" ,"\\C" ,"\\cd" ,"\\copy" ,
12781278"\\copyright" ,"\\crosstabview" ,
1279- "\\d" ,"\\da" ,"\\db" ,"\\dc" ,"\\dC" ,"\\dd" ,"\\ddp" ,"\\dD" ,
1279+ "\\d" ,"\\da" ,"\\dA" , "\\ db" ,"\\dc" ,"\\dC" ,"\\dd" ,"\\ddp" ,"\\dD" ,
12801280"\\des" ,"\\det" ,"\\deu" ,"\\dew" ,"\\dE" ,"\\df" ,
12811281"\\dF" ,"\\dFd" ,"\\dFp" ,"\\dFt" ,"\\dg" ,"\\di" ,"\\dl" ,"\\dL" ,
12821282"\\dm" ,"\\dn" ,"\\do" ,"\\dO" ,"\\dp" ,"\\drds" ,"\\ds" ,"\\dS" ,
@@ -1910,7 +1910,8 @@ psql_completion(const char *text, int start, int end)
19101910else if (Matches2 ("COMMENT" ,"ON" ))
19111911{
19121912static const char * const list_COMMENT []=
1913- {"CAST" ,"COLLATION" ,"CONVERSION" ,"DATABASE" ,"EVENT TRIGGER" ,"EXTENSION" ,
1913+ {"ACCESS METHOD" ,"CAST" ,"COLLATION" ,"CONVERSION" ,"DATABASE" ,
1914+ "EVENT TRIGGER" ,"EXTENSION" ,
19141915"FOREIGN DATA WRAPPER" ,"FOREIGN TABLE" ,
19151916"SERVER" ,"INDEX" ,"LANGUAGE" ,"POLICY" ,"RULE" ,"SCHEMA" ,"SEQUENCE" ,
19161917"TABLE" ,"TYPE" ,"VIEW" ,"MATERIALIZED VIEW" ,"COLUMN" ,"AGGREGATE" ,"FUNCTION" ,
@@ -1919,6 +1920,8 @@ psql_completion(const char *text, int start, int end)
19191920
19201921COMPLETE_WITH_LIST (list_COMMENT );
19211922}
1923+ else if (Matches4 ("COMMENT" ,"ON" ,"ACCESS" ,"METHOD" ))
1924+ COMPLETE_WITH_QUERY (Query_for_list_of_access_methods );
19221925else if (Matches3 ("COMMENT" ,"ON" ,"FOREIGN" ))
19231926COMPLETE_WITH_LIST2 ("DATA WRAPPER" ,"TABLE" );
19241927else if (Matches4 ("COMMENT" ,"ON" ,"TEXT" ,"SEARCH" ))
@@ -2331,6 +2334,12 @@ psql_completion(const char *text, int start, int end)
23312334else if (Matches5 ("DROP" ,"TRIGGER" ,MatchAny ,"ON" ,MatchAny ))
23322335COMPLETE_WITH_LIST2 ("CASCADE" ,"RESTRICT" );
23332336
2337+ /* DROP ACCESS METHOD */
2338+ else if (Matches2 ("DROP" ,"ACCESS" ))
2339+ COMPLETE_WITH_CONST ("METHOD" );
2340+ else if (Matches3 ("DROP" ,"ACCESS" ,"METHOD" ))
2341+ COMPLETE_WITH_QUERY (Query_for_list_of_access_methods );
2342+
23342343/* DROP EVENT TRIGGER */
23352344else if (Matches2 ("DROP" ,"EVENT" ))
23362345COMPLETE_WITH_CONST ("TRIGGER" );
@@ -2931,6 +2940,8 @@ psql_completion(const char *text, int start, int end)
29312940}
29322941else if (TailMatchesCS1 ("\\da*" ))
29332942COMPLETE_WITH_SCHEMA_QUERY (Query_for_list_of_aggregates ,NULL );
2943+ else if (TailMatchesCS1 ("\\dA*" ))
2944+ COMPLETE_WITH_QUERY (Query_for_list_of_access_methods );
29342945else if (TailMatchesCS1 ("\\db*" ))
29352946COMPLETE_WITH_QUERY (Query_for_list_of_tablespaces );
29362947else if (TailMatchesCS1 ("\\dD*" ))