COMPLETE_WITH_LIST(list_ALTERMATVIEW);
    }
 
+   /* ALTER POLICY <name> */
+   else if (pg_strcasecmp(prev2_wd, "ALTER") == 0 &&
+            pg_strcasecmp(prev_wd, "POLICY") == 0)
+       COMPLETE_WITH_QUERY(Query_for_list_of_policies);
    /* ALTER POLICY <name> ON */
    else if (pg_strcasecmp(prev3_wd, "ALTER") == 0 &&
             pg_strcasecmp(prev2_wd, "POLICY") == 0)
    else if (pg_strcasecmp(prev4_wd, "ALTER") == 0 &&
             pg_strcasecmp(prev3_wd, "POLICY") == 0 &&
             pg_strcasecmp(prev_wd, "ON") == 0)
-       COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables, NULL);
+   {
+       completion_info_charp = prev2_wd;
+       COMPLETE_WITH_QUERY(Query_for_list_of_tables_for_policy);
+   }
    /* ALTER POLICY <name> ON <table> - show options */
    else if (pg_strcasecmp(prev5_wd, "ALTER") == 0 &&
             pg_strcasecmp(prev4_wd, "POLICY") == 0 &&