8000 Fix regression tests, take two · johto/postgres@4021657 · GitHub
[go: up one dir, main page]
8000 Skip to content

Commit 4021657

Browse files
johtojohto
committed
Fix regression tests, take two
1 parent 59941f0 commit 4021657

File tree

10 files changed

+585
-64
lines changed

10 files changed

+585
-64
lines changed

‎src/test/regress/expected/alter_table.out

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,11 +361,14 @@ CREATE FUNCTION boo(int) RETURNS int IMMUTABLE STRICT LANGUAGE plpgsql AS $$ BEG
361361
INSERT INTO tmp7 VALUES (8, 18);
362362
ALTER TABLE tmp7 ADD CONSTRAINT identity CHECK (b = boo(b));
363363
NOTICE: boo: 18
364+
CONTEXT: PL/pgSQL function boo(integer) line 1 at RAISE
364365
ALTER TABLE tmp3 ADD CONSTRAINT IDENTITY check (b = boo(b)) NOT VALID;
365366
NOTICE: merging constraint "identity" with inherited definition
366367
ALTER TABLE tmp3 VALIDATE CONSTRAINT identity;
367368
NOTICE: boo: 16
369+
CONTEXT: PL/pgSQL function boo(integer) line 1 at RAISE
368370
NOTICE: boo: 20
371+
CONTEXT: PL/pgSQL function boo(integer) line 1 at RAISE
369372
-- Try (and fail) to create constraint from tmp5(a) to tmp4(a) - unique constraint on
370373
-- tmp4 is a,b
371374
ALTER TABLE tmp5 add constraint tmpconstr foreign key(a) references tmp4(a) match full;

‎src/test/regress/expected/event_trigger.out

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,13 @@ alter event trigger regress_event_trigger disable;
7070
-- regress_event_trigger
7171
create table event_trigger_fire1 (a int);
7272
NOTICE: test_event_trigger: ddl_command_start CREATE TABLE
73+
CONTEXT: PL/pgSQL function test_event_trigger() line 3 at RAISE
7374
NOTICE: test_event_trigger: ddl_command_end CREATE TABLE
75+
CONTEXT: PL/pgSQL function test_event_trigger() line 3 at RAISE
7476
-- regress_event_trigger_end should fire here
7577
drop table event_trigger_fire1;
7678
NOTICE: test_event_trigger: ddl_command_end DROP TABLE
79+
CONTEXT: PL/pgSQL function test_event_trigger() line 3 at RAISE
7780
-- alter owner to non-superuser should fail
7881
alter event trigger regress_event_trigger owner to regression_bob;
7982
ERROR: permission denied to change owner of event trigger "regress_event_trigger"
@@ -194,7 +197,8 @@ PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
194197
SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
195198
PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
196199
ERROR: object audit_tbls.schema_two_table_three of type table cannot be dropped
197-
CONTEXT: SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
200+
CONTEXT: PL/pgSQL function undroppable() line 14 at RAISE
201+
SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
198202
PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
199203
DELETE FROM undroppable_objs WHERE object_identity = 'audit_tbls.schema_two_table_three';
200204
DROP SCHEMA schema_one, schema_two CASCADE;
@@ -224,6 +228,7 @@ NOTICE: table "schema_one_table_three" does not exist, skipping
224228
CONTEXT: SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_three"
225229
PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
226230
ERROR: object schema_one.table_three of type table cannot be dropped
231+
CONTEXT: PL/pgSQL function undroppable() line 14 at RAISE
227232
DELETE FROM undroppable_objs WHERE object_identity = 'schema_one.table_three';
228233
DROP SCHEMA schema_one, schema_two CASCADE;
229234
NOTICE: drop cascades to 7 other objects

‎src/test/regress/expected/plancache.out

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,11 @@ NOTICE: table "temptable" does not exist, skipping
237237
CONTEXT: SQL statement "drop table if exists temptable cascade"
238238
PL/pgSQL function cachebug() line 4 at SQL statement
239239
NOTICE: 1
240+
CONTEXT: PL/pgSQL function cachebug() line 8 at RAISE
240241
NOTICE: 2
242+
CONTEXT: PL/pgSQL function cachebug() line 8 at RAISE
241243
NOTICE: 3
244+
CONTEXT: PL/pgSQL function cachebug() line 8 at RAISE
242245
cachebug
243246
----------
244247

@@ -249,8 +252,11 @@ NOTICE: drop cascades to view vv
249252
CONTEXT: SQL statement "drop table if exists temptable cascade"
250253
PL/pgSQL function cachebug() line 4 at SQL statement
251254
NOTICE: 1
255+
CONTEXT: PL/pgSQL function cachebug() line 8 at RAISE
252256
NOTICE: 2
257+
CONTEXT: PL/pgSQL function cachebug() line 8 at RAISE
253258
NOTICE: 3
259+
CONTEXT: PL/pgSQL function cachebug() line 8 at RAISE
254260
cachebug
255261
----------
256262

0 commit comments

Comments
 (0)
0