Hi,
When benchmarking an application I got annoyed at how basic the tab
completion for ALTER TABLE ... DISABLE/ENABLE TRIGGER and DROP TRIGGER
is. So here is a patch improving the tab completion around triggers. For
consistency I have also added the same completions to rules since their
DDL is almost identical.
--
Andreas Karlsson
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
new file mode 100644
index 6d26ffc..65483de
*** a/src/bin/psql/tab-complete.c
--- b/src/bin/psql/tab-complete.c
*** static const SchemaQuery Query_for_list_
*** 626,631
--- 626,639
WHERE pg_catalog.quote_ident(conname)='%s')
/* the silly-looking length condition is just to eat up the current word */
+ #define Query_for_rule_of_table \
+ SELECT pg_catalog.quote_ident(rulename) \
+ FROM pg_catalog.pg_class c1, pg_catalog.pg_rewrite \
+ WHERE c1.oid=ev_class and (%d = pg_catalog.length('%s'))\
+and pg_catalog.quote_ident(c1.relname)='%s'\
+and pg_catalog.pg_table_is_visible(c1.oid)
+
+ /* the silly-looking length condition is just to eat up the current word */
#define Query_for_list_of_tables_for_rule \
SELECT pg_catalog.quote_ident(relname) \
FROM pg_catalog.pg_class\
*** static const SchemaQuery Query_for_list_
*** 635,640
--- 643,656
WHERE pg_catalog.quote_ident(rulename)='%s')
/* the silly-looking length condition is just to eat up the current word */
+ #define Query_for_trigger_of_table \
+ SELECT pg_catalog.quote_ident(tgname) \
+ FROM pg_catalog.pg_class c1, pg_catalog.pg_trigger \
+ WHERE c1.oid=tgrelid and (%d = pg_catalog.length('%s'))\
+and pg_catalog.quote_ident(c1.relname)='%s'\
+and pg_catalog.pg_table_is_visible(c1.oid)
+
+ /* the silly-looking length condition is just to eat up the current word */
#define Query_for_list_of_tables_for_trigger \
SELECT pg_catalog.quote_ident(relname) \
FROM pg_catalog.pg_class\
*** psql_completion(const char *text, int st
*** 1409,1414
--- 1425,1462
COMPLETE_WITH_LIST(list_ALTERENABLE2);
}
+ else if (pg_strcasecmp(prev5_wd, ALTER) == 0
+ pg_strcasecmp(prev4_wd, TABLE) == 0
+ pg_strcasecmp(prev2_wd, ENABLE) == 0
+ pg_strcasecmp(prev_wd, RULE) == 0)
+ {
+ completion_info_charp = prev3_wd;
+ COMPLETE_WITH_QUERY(Query_for_rule_of_table);
+ }
+ else if (pg_strcasecmp(prev6_wd, ALTER) == 0
+ pg_strcasecmp(prev5_wd, TABLE) == 0
+ pg_strcasecmp(prev3_wd, ENABLE) == 0
+ pg_strcasecmp(prev_wd, RULE) == 0)
+ {
+ completion_info_charp = prev4_wd;
+ COMPLETE_WITH_QUERY(Query_for_rule_of_table);
+ }
+ else if (pg_strcasecmp(prev5_wd, ALTER) == 0
+ pg_strcasecmp(prev4_wd, TABLE) == 0
+ pg_strcasecmp(prev2_wd, ENABLE) == 0
+ pg_strcasecmp(prev_wd, TRIGGER) == 0)
+ {
+ completion_info_charp = prev3_wd;
+ COMPLETE_WITH_QUERY(Query_for_trigger_of_table);
+ }
+ else if (pg_strcasecmp(prev6_wd, ALTER) == 0
+ pg_strcasecmp(prev5_wd, TABLE) == 0
+ pg_strcasecmp(prev3_wd, ENABLE) == 0
+ pg_strcasecmp(prev_wd, TRIGGER) == 0)
+ {
+ completion_info_charp = prev4_wd;
+ COMPLETE_WITH_QUERY(Query_for_trigger_of_table);
+ }
/* ALTER TABLE xxx INHERIT */
else if (pg_strcasecmp(prev4_wd, ALTER) == 0
pg_strcasecmp(prev3_wd, TABLE) == 0
*** psql_completion(const char *text, int st
*** 1424,1429
--- 1472,1478
{
COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables, );
}
+ /* ALTER TABLE xxx DISABLE */
else if (pg_strcasecmp(prev4_wd, ALTER) == 0
pg_strcasecmp(prev3_wd, TABLE) == 0
pg_strcasecmp(prev_wd, DISABLE) == 0)
*** psql_completion(const char *text, int st
*** 1433,1438
--- 1482,1503
COMPLETE_WITH_LIST(list_ALTERDISABLE);
}
+ else if (pg_strcasecmp(prev5_wd, ALTER) == 0
+ pg_strcasecmp(prev4_wd, TABLE) == 0
+ pg_strcasecmp(prev2_wd, DISABLE) == 0
+ pg_strcasecmp(prev_wd, RULE) == 0)
+ {
+ completion_info_charp = prev3_wd;
+ COMPLETE_WITH_QUERY(Query_for_rule_of_table);
+ }
+ else if (pg_strcasecmp(prev5_wd, ALTER) == 0
+ pg_strcasecmp(prev4_wd, TABLE) == 0
+ pg_strcasecmp(prev2_wd, DISABLE) == 0
+ pg_strcasecmp(prev_wd, TRIGGER) == 0)
+ {
+ completion_info_charp = prev3_wd;
+ COMPLETE_WITH_QUERY(Query_for_trigger_of_table);
+ }
/* ALTER TABLE xxx ALTER */
else if (pg_strcasecmp(prev4_wd, ALTER) == 0
*** psql_completion(const char *text, int st
*** 2587,2592
--- 2652,2680
COMPLETE_WITH_LIST(list_ALTERTEXTSEARCH);
}
+ /* DROP TRIGGER */
+ else if (pg_strcasecmp(prev3_wd, DROP) == 0
+ pg_strcasecmp(prev2_wd, TRIGGER) == 0)
+ {
+ COMPLETE_WITH_CONST(ON);
+ }
+ else if (pg_strcasecmp(prev4_wd, DROP) == 0
+ pg_strcasecmp(prev3_wd, TRIGGER) == 0
+ pg_strcasecmp(prev_wd, ON) == 0)
+ {
+ completion_info_charp = prev2_wd;
+
