NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit257d815

committed

Fix unstable regression test results.

Commit2ac3ef7 added a query with an underdetermined output row order;it has failed multiple times in the buildfarm since then. Add an ORDER BYto fix. Also, don't rely on a DROP CASCADE to drop in a well-determinedorder; that hasn't failed yet but I don't trust it much, and we're notsaving any typing by using CASCADE anyway.

1 parent80a7298 commit257d815Copy full SHA for 257d815

File tree

2 files changed

-7

lines changed

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

2 files changed

-7

lines changed

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

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,8 @@ from pg_attribute`
`314`	`314`	`where attname = 'a'`
`315`	`315`	`and (attrelid = 'p'::regclass`
`316`	`316`	`or attrelid = 'p1'::regclass`
`317`		`- or attrelid = 'p11'::regclass);`
	`317`	`+ or attrelid = 'p11'::regclass)`
	`318`	`+order by attrelid::regclass::text;`
`318`	`319`	`attrelid \| attname \| attnum`
`319`	`320`	`----------+---------+--------`
`320`	`321`	`p \| a \| 1`
`@@ -333,7 +334,4 @@ select tableoid::regclass, * from p;`
`333`	`334`	`(1 row)`
`334`	`335`
`335`	`336`	`-- cleanup`
`336`		`-drop table p cascade;`
`337`		`-NOTICE: drop cascades to 2 other objects`
`338`		`-DETAIL: drop cascades to table p1`
`339`		`-drop cascades to table p11`
	`337`	`+drop table p, p1, p11;`

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

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,8 @@ from pg_attribute`
`185`	`185`	`where attname='a'`
`186`	`186`	`and (attrelid='p'::regclass`
`187`	`187`	`or attrelid='p1'::regclass`
`188`		`-or attrelid='p11'::regclass);`
	`188`	`+or attrelid='p11'::regclass)`
	`189`	`+order by attrelid::regclass::text;`
`189`	`190`
`190`	`191`	`altertable p1 attach partition p11 forvaluesfrom (2) to (5);`
`191`	`192`	`altertable p attach partition p1 forvaluesfrom (1,2) to (1,10);`
`@@ -195,4 +196,4 @@ insert into p values (1, 2);`
`195`	`196`	`select tableoid::regclass,*from p;`
`196`	`197`
`197`	`198`	`-- cleanup`
`198`		`-droptable p cascade;`
	`199`	`+droptable p, p1, p11;`

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!

Commit257d815

File tree

2 files changed

2 files changed

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

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

0 commit comments