git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Remove event trigger from object_address test

author Alvaro Herrera <alvherre@alvh.no-ip.org>

2014年12月26日 17:18:09 +0000 (14:18 -0300)

committer Alvaro Herrera <alvherre@alvh.no-ip.org>

2014年12月26日 17:18:09 +0000 (14:18 -0300)

It is causing trouble when run in parallel mode, because dropping the
function other sessions are running concurrently causes them to fail due
to inability to find the function.

Per buildfarm, as noted by Tom Lane.

src/test/regress/expected/object_address.out patch | blob | blame | history

src/test/regress/sql/object_address.sql patch | blob | blame | history

diff --git a/src/test/regress/expected/object_address.out b/src/test/regress/expected/object_address.out

index 1528b29317b29096383db44a7c22f14d8be3bfb3..b760d357eb381c77aaf79598070db9c390fabe98 100644 (file)

--- a/src/test/regress/expected/object_address.out

+++ b/src/test/regress/expected/object_address.out

@@ -28,8 +28,6 @@ CREATE DOMAIN addr_nsp.gendomain AS int4 CONSTRAINT domconstr CHECK (value > 0);

CREATE FUNCTION addr_nsp.trig() RETURNS TRIGGER LANGUAGE plpgsql AS $$ BEGIN END; $$;

CREATE TRIGGER t BEFORE INSERT ON addr_nsp.gentable FOR EACH ROW EXECUTE PROCEDURE addr_nsp.trig();

CREATE POLICY genpol ON addr_nsp.gentable;

-CREATE FUNCTION addr_nsp.etrig() RETURNS EVENT_TRIGGER LANGUAGE plpgsql AS $$ BEGIN END; $$;

-CREATE EVENT TRIGGER evttrig ON ddl_command_end EXECUTE PROCEDURE addr_nsp.etrig();

-- test some error cases

SELECT pg_get_object_address('stone', '{}', '{}');

ERROR: unrecognized object type "stone"

@@ -338,7 +336,7 @@ WITH objects (type, name, args) AS (VALUES

('server', '{addr_fserv}', '{}'),

-- user mapping

-- extension

- ('event trigger', '{evttrig}', '{}'),

+ -- event trigger

('policy', '{addr_nsp, gentable, genpol}', '{}')

)

SELECT (pg_identify_object(classid, objid, subobjid)).*

@@ -377,12 +375,11 @@ ORDER BY classid, objid;

operator family | pg_catalog | integer_ops | pg_catalog.integer_ops for btree

policy | | | genpol on addr_nsp.gentable

collation | pg_catalog | "default" | pg_catalog."default"

- event trigger | | evttrig | evttrig

text search dictionary | addr_nsp | addr_ts_dict | addr_nsp.addr_ts_dict

text search parser | addr_nsp | addr_ts_prs | addr_nsp.addr_ts_prs

text search configuration | addr_nsp | addr_ts_conf | addr_nsp.addr_ts_conf

text search template | addr_nsp | addr_ts_temp | addr_nsp.addr_ts_temp

-(36 rows)

+(35 rows)

---

--- Cleanup resources

diff --git a/src/test/regress/sql/object_address.sql b/src/test/regress/sql/object_address.sql

index 6cba0923610c9c03cbb7f3ad9ab9620dfc9e3d58..e5209b9e449545960c5b4b54ad167f28ec915391 100644 (file)

--- a/src/test/regress/sql/object_address.sql

+++ b/src/test/regress/sql/object_address.sql

@@ -33,9 +33,6 @@ CREATE FUNCTION addr_nsp.trig() RETURNS TRIGGER LANGUAGE plpgsql AS $$ BEGIN END