Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 98976d0

Browse files
committed
Rename test table to avoid cs_CZ locale problem
Per buildfarm member Hippopotamus
1 parent b0e96f3 commit 98976d0

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

src/test/regress/expected/inherit.out

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2251,7 +2251,7 @@ select conrelid::regclass, conname, contype, coninhcount, conislocal
22512251
-- test deinherit procedure
22522252
--
22532253
-- deinherit inh_child1
2254-
create table inh_grandchld () inherits (inh_child1);
2254+
create table inh_child3 () inherits (inh_child1);
22552255
alter table inh_child1 no inherit inh_parent;
22562256
\d+ inh_parent
22572257
Table "public.inh_parent"
@@ -2269,7 +2269,7 @@ Not-null constraints:
22692269
Not-null constraints:
22702270
"inh_child1_f1_not_null" NOT NULL "f1"
22712271
Child tables: inh_child2,
2272-
inh_grandchld
2272+
inh_child3
22732273

22742274
\d+ inh_child2
22752275
Table "public.inh_child2"
@@ -2282,17 +2282,17 @@ Inherits: inh_child1
22822282

22832283
select conrelid::regclass, conname, contype, coninhcount, conislocal
22842284
from pg_constraint where contype = 'n' and
2285-
conrelid::regclass::text in ('inh_parent', 'inh_child1', 'inh_child2', 'inh_grandchld')
2285+
conrelid::regclass::text in ('inh_parent', 'inh_child1', 'inh_child2', 'inh_child3')
22862286
order by 2, 1;
2287-
conrelid | conname | contype | coninhcount | conislocal
2288-
---------------+------------------------+---------+-------------+------------
2289-
inh_child1 | inh_child1_f1_not_null | n | 0 | t
2290-
inh_grandchld | inh_child1_f1_not_null | n | 1 | f
2291-
inh_child2 | inh_child2_f1_not_null | n | 1 | t
2292-
inh_parent | inh_parent_f1_not_null | n | 0 | t
2287+
conrelid | conname | contype | coninhcount | conislocal
2288+
------------+------------------------+---------+-------------+------------
2289+
inh_child1 | inh_child1_f1_not_null | n | 0 | t
2290+
inh_child3 | inh_child1_f1_not_null | n | 1 | f
2291+
inh_child2 | inh_child2_f1_not_null | n | 1 | t
2292+
inh_parent | inh_parent_f1_not_null | n | 0 | t
22932293
(4 rows)
22942294

2295-
drop table inh_parent, inh_child1, inh_child2, inh_grandchld;
2295+
drop table inh_parent, inh_child1, inh_child2, inh_child3;
22962296
-- a PK in parent must have a not-null in child that it can mark inherited
22972297
create table inh_parent (a int primary key);
22982298
create table inh_child (a int primary key);
@@ -2307,26 +2307,26 @@ drop table inh_parent, inh_child;
23072307
create table inh_parent(f1 int not null);
23082308
create table inh_child1() inherits(inh_parent);
23092309
create table inh_child2() inherits(inh_parent);
2310-
create table inh_grandchld() inherits(inh_child1, inh_child2);
2310+
create table inh_child3() inherits(inh_child1, inh_child2);
23112311
NOTICE: merging multiple inherited definitions of column "f1"
23122312
-- show constraint info
23132313
select conrelid::regclass, conname, contype, coninhcount, conislocal
23142314
from pg_constraint where contype = 'n' and
2315-
conrelid in ('inh_parent'::regclass, 'inh_child1'::regclass, 'inh_child2'::regclass, 'inh_grandchld'::regclass)
2315+
conrelid in ('inh_parent'::regclass, 'inh_child1'::regclass, 'inh_child2'::regclass, 'inh_child3'::regclass)
23162316
order by 2, conrelid::regclass::text;
2317-
conrelid | conname | contype | coninhcount | conislocal
2318-
---------------+------------------------+---------+-------------+------------
2319-
inh_child1 | inh_parent_f1_not_null | n | 1 | f
2320-
inh_child2 | inh_parent_f1_not_null | n | 1 | f
2321-
inh_grandchld | inh_parent_f1_not_null | n | 2 | f
2322-
inh_parent | inh_parent_f1_not_null | n | 0 | t
2317+
conrelid | conname | contype | coninhcount | conislocal
2318+
------------+------------------------+---------+-------------+------------
2319+
inh_child1 | inh_parent_f1_not_null | n | 1 | f
2320+
inh_child2 | inh_parent_f1_not_null | n | 1 | f
2321+
inh_child3 | inh_parent_f1_not_null | n | 2 | f
2322+
inh_parent | inh_parent_f1_not_null | n | 0 | t
23232323
(4 rows)
23242324

23252325
drop table inh_parent cascade;
23262326
NOTICE: drop cascades to 3 other objects
23272327
DETAIL: drop cascades to table inh_child1
23282328
drop cascades to table inh_child2
2329-
drop cascades to table inh_grandchld
2329+
drop cascades to table inh_child3
23302330
-- test child table with inherited columns and
23312331
-- with explicitly specified not null constraints
23322332
create table inh_parent_1(f1 int);

src/test/regress/sql/inherit.sql

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -823,16 +823,16 @@ select conrelid::regclass, conname, contype, coninhcount, conislocal
823823
--
824824

825825
-- deinherit inh_child1
826-
create table inh_grandchld () inherits (inh_child1);
826+
create table inh_child3 () inherits (inh_child1);
827827
alter table inh_child1 no inherit inh_parent;
828828
\d+ inh_parent
829829
\d+ inh_child1
830830
\d+ inh_child2
831831
select conrelid::regclass, conname, contype, coninhcount, conislocal
832832
from pg_constraint where contype = 'n' and
833-
conrelid::regclass::text in ('inh_parent', 'inh_child1', 'inh_child2', 'inh_grandchld')
833+
conrelid::regclass::text in ('inh_parent', 'inh_child1', 'inh_child2', 'inh_child3')
834834
order by 2, 1;
835-
drop table inh_parent, inh_child1, inh_child2, inh_grandchld;
835+
drop table inh_parent, inh_child1, inh_child2, inh_child3;
836836

837837
-- a PK in parent must have a not-null in child that it can mark inherited
838838
create table inh_parent (a int primary key);
@@ -848,12 +848,12 @@ drop table inh_parent, inh_child;
848848
create table inh_parent(f1 int not null);
849849
create table inh_child1() inherits(inh_parent);
850850
create table inh_child2() inherits(inh_parent);
851-
create table inh_grandchld() inherits(inh_child1, inh_child2);
851+
create table inh_child3() inherits(inh_child1, inh_child2);
852852

853853
-- show constraint info
854854
select conrelid::regclass, conname, contype, coninhcount, conislocal
855855
from pg_constraint where contype = 'n' and
856-
conrelid in ('inh_parent'::regclass, 'inh_child1'::regclass, 'inh_child2'::regclass, 'inh_grandchld'::regclass)
856+
conrelid in ('inh_parent'::regclass, 'inh_child1'::regclass, 'inh_child2'::regclass, 'inh_child3'::regclass)
857857
order by 2, conrelid::regclass::text;
858858

859859
drop table inh_parent cascade;

0 commit comments

Comments
 (0)