NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitd86fb72

committed

Fix name collision between concurrent regression tests.

Commitf5bcd39 introduced a test usinga table named "circles" in inherit.sql. Unfortunately, the concurrentlyexecuted constraints test was already using that table name, so theparallel regression tests would sometimes fail. Rename table to dodgethe problem. Per buildfarm.

1 parent641054a commitd86fb72Copy full SHA for d86fb72

File tree

2 files changed

+24

-24

lines changed

src/test/regress
- expected
  - inherit.out
- sql
  - inherit.sql

2 files changed

+24

-24

lines changed

`‎src/test/regress/expected/inherit.out`

Lines changed: 16 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -1009,41 +1009,41 @@ Has OIDs: no`
`1009`	`1009`
`1010`	`1010`	`DROP TABLE test_constraints_inh;`
`1011`	`1011`	`DROP TABLE test_constraints;`
`1012`		`-CREATE TABLEcircles (`
	`1012`	`+CREATE TABLEtest_ex_constraints (`
`1013`	`1013`	`c circle,`
`1014`	`1014`	`EXCLUDE USING gist (c WITH &&)`
`1015`	`1015`	`);`
`1016`		`-NOTICE: CREATE TABLE / EXCLUDE will create implicit index "circles_c_excl" for table "circles"`
`1017`		`-CREATE TABLEcircles_inh () INHERITS (circles);`
`1018`		`-\d+circles`
`1019`		`-Table "public.circles"`
	`1016`	`+NOTICE: CREATE TABLE / EXCLUDE will create implicit index "test_ex_constraints_c_excl" for table "test_ex_constraints"`
	`1017`	`+CREATE TABLEtest_ex_constraints_inh () INHERITS (test_ex_constraints);`
	`1018`	`+\d+test_ex_constraints`
	`1019`	`+ Table "public.test_ex_constraints"`
`1020`	`1020`	`Column \| Type \| Modifiers \| Storage \| Stats target \| Description`
`1021`	`1021`	`--------+--------+-----------+---------+--------------+-------------`
`1022`	`1022`	`c \| circle \| \| plain \| \|`
`1023`	`1023`	`Indexes:`
`1024`		`- "circles_c_excl" EXCLUDE USING gist (c WITH &&)`
`1025`		`-Child tables:circles_inh`
	`1024`	`+ "test_ex_constraints_c_excl" EXCLUDE USING gist (c WITH &&)`
	`1025`	`+Child tables:test_ex_constraints_inh`
`1026`	`1026`	`Has OIDs: no`
`1027`	`1027`
`1028`		`-ALTER TABLEcircles DROP CONSTRAINTcircles_c_excl;`
`1029`		`-\d+circles`
`1030`		`-Table "public.circles"`
	`1028`	`+ALTER TABLEtest_ex_constraints DROP CONSTRAINTtest_ex_constraints_c_excl;`
	`1029`	`+\d+test_ex_constraints`
	`1030`	`+ Table "public.test_ex_constraints"`
`1031`	`1031`	`Column \| Type \| Modifiers \| Storage \| Stats target \| Description`
`1032`	`1032`	`--------+--------+-----------+---------+--------------+-------------`
`1033`	`1033`	`c \| circle \| \| plain \| \|`
`1034`		`-Child tables:circles_inh`
	`1034`	`+Child tables:test_ex_constraints_inh`
`1035`	`1035`	`Has OIDs: no`
`1036`	`1036`
`1037`		`-\d+circles_inh`
`1038`		`-Table "public.circles_inh"`
	`1037`	`+\d+test_ex_constraints_inh`
	`1038`	`+ Table "public.test_ex_constraints_inh"`
`1039`	`1039`	`Column \| Type \| Modifiers \| Storage \| Stats target \| Description`
`1040`	`1040`	`--------+--------+-----------+---------+--------------+-------------`
`1041`	`1041`	`c \| circle \| \| plain \| \|`
`1042`		`-Inherits:circles`
	`1042`	`+Inherits:test_ex_constraints`
`1043`	`1043`	`Has OIDs: no`
`1044`	`1044`
`1045`		`-DROP TABLEcircles_inh;`
`1046`		`-DROP TABLEcircles;`
	`1045`	`+DROP TABLEtest_ex_constraints_inh;`
	`1046`	`+DROP TABLEtest_ex_constraints;`
`1047`	`1047`	`-- Test non-inheritable foreign key contraints`
`1048`	`1048`	`CREATE TABLE test_primary_constraints(id int PRIMARY KEY);`
`1049`	`1049`	`NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "test_primary_constraints_pkey" for table "test_primary_constraints"`

`‎src/test/regress/sql/inherit.sql`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -302,17 +302,17 @@ ALTER TABLE ONLY test_constraints DROP CONSTRAINT test_constraints_val1_val2_key`
`302`	`302`	`DROPTABLE test_constraints_inh;`
`303`	`303`	`DROPTABLE test_constraints;`
`304`	`304`
`305`		`-CREATETABLEcircles (`
	`305`	`+CREATETABLEtest_ex_constraints (`
`306`	`306`	`ccircle,`
`307`	`307`	`EXCLUDE USING gist (c WITH &&)`
`308`	`308`	`);`
`309`		`-CREATETABLEcircles_inh () INHERITS (circles);`
`310`		`-\d+circles`
`311`		`-ALTERTABLEcircles DROPCONSTRAINTcircles_c_excl;`
`312`		`-\d+circles`
`313`		`-\d+circles_inh`
`314`		`-DROPTABLEcircles_inh;`
`315`		`-DROPTABLEcircles;`
	`309`	`+CREATETABLEtest_ex_constraints_inh () INHERITS (test_ex_constraints);`
	`310`	`+\d+test_ex_constraints`
	`311`	`+ALTERTABLEtest_ex_constraints DROPCONSTRAINTtest_ex_constraints_c_excl;`
	`312`	`+\d+test_ex_constraints`
	`313`	`+\d+test_ex_constraints_inh`
	`314`	`+DROPTABLEtest_ex_constraints_inh;`
	`315`	`+DROPTABLEtest_ex_constraints;`
`316`	`316`
`317`	`317`	`-- Test non-inheritable foreign key contraints`
`318`	`318`	`CREATETABLEtest_primary_constraints(idintPRIMARY KEY);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitd86fb72

File tree

2 files changed

2 files changed

`‎src/test/regress/expected/inherit.out`

`‎src/test/regress/sql/inherit.sql`

0 commit comments