diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2019-02-07 09:01:54 +0100 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2019-02-07 09:21:34 +0100 |
| commit | 0c1f8f166cb6273ab9c06a5f3c2ebedbf36f93e9 (patch) | |
| tree | 96d68fe65731b323bcd34029bcc346738625d8a3 /src/backend | |
| parent | 13b89f96d07ad3da67b57f66c134c3609bd3e98f (diff) | |
| download | postgresql-0c1f8f166cb6273ab9c06a5f3c2ebedbf36f93e9.tar.gz postgresql-0c1f8f166cb6273ab9c06a5f3c2ebedbf36f93e9.zip | |
Use EXECUTE FUNCTION syntax for triggers more
Change pg_dump and ruleutils.c to use the FUNCTION keyword instead of
PROCEDURE in trigger and event trigger definitions.
This completes the pieces of the transition started in
0a63f996e018ac508c858e87fa39cc254a5db49f that were kept out of
PostgreSQL 11 because of the required catversion change.
Discussion: https://www.postgresql.org/message-id/381bef53-f7be-29c8-d977-948e389161d6@2ndquadrant.com
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/catalog/information_schema.sql | 4 | ||||
| -rw-r--r-- | src/backend/utils/adt/ruleutils.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/catalog/information_schema.sql b/src/backend/catalog/information_schema.sql index b27ff5fa352..94e482596f8 100644 --- a/src/backend/catalog/information_schema.sql +++ b/src/backend/catalog/information_schema.sql @@ -2094,12 +2094,12 @@ CREATE VIEW triggers AS AS cardinal_number) AS action_order, CAST( CASE WHEN pg_has_role(c.relowner, 'USAGE') - THEN (regexp_match(pg_get_triggerdef(t.oid), E'.{35,} WHEN \\((.+)\\) EXECUTE PROCEDURE'))[1] + THEN (regexp_match(pg_get_triggerdef(t.oid), E'.{35,} WHEN \\((.+)\\) EXECUTE FUNCTION'))[1] ELSE null END AS character_data) AS action_condition, CAST( substring(pg_get_triggerdef(t.oid) from - position('EXECUTE PROCEDURE' in substring(pg_get_triggerdef(t.oid) from 48)) + 47) + position('EXECUTE FUNCTION' in substring(pg_get_triggerdef(t.oid) from 48)) + 47) AS character_data) AS action_statement, CAST( -- hard-wired reference to TRIGGER_TYPE_ROW diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 17a28c26517..e1fbe494d5d 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -1044,7 +1044,7 @@ pg_get_triggerdef_worker(Oid trigid, bool pretty) appendStringInfoString(&buf, ") "); } - appendStringInfo(&buf, "EXECUTE PROCEDURE %s(", + appendStringInfo(&buf, "EXECUTE FUNCTION %s(", generate_function_name(trigrec->tgfoid, 0, NIL, argtypes, false, NULL, EXPR_KIND_NONE)); |