NotificationsYou must be signed in to change notification settings
Fork4.9k
Star17.7k

Commit6ff21c0

committed

psql: Make output of \dD more stable

\dD showed domain check constraints in arbitrary order, which cancause regression test failures, which was exposed by commit9895b35. To fix, order the constraints by conname, which matcheswhat psql does in other queries listing constraints.

1 parent9895b35 commit6ff21c0Copy full SHA for 6ff21c0

File tree

2 files changed

-2

lines changed

src
- bin/psql
  - describe.c
- test/regress/expected
  - domain.out

2 files changed

-2

lines changed

`‎src/bin/psql/describe.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4449,7 +4449,7 @@ listDomains(const char *pattern, bool verbose, bool showSystem)`
`4449`	`4449`	`" CASE WHEN t.typnotnull THEN 'not null' END as \"%s\",\n"`
`4450`	`4450`	`" t.typdefault as \"%s\",\n"`
`4451`	`4451`	`" pg_catalog.array_to_string(ARRAY(\n"`
`4452`		`-" SELECT pg_catalog.pg_get_constraintdef(r.oid, true) FROM pg_catalog.pg_constraint r WHERE t.oid = r.contypid AND r.contype = 'c'\n"`
	`4452`	`+" SELECT pg_catalog.pg_get_constraintdef(r.oid, true) FROM pg_catalog.pg_constraint r WHERE t.oid = r.contypid AND r.contype = 'c' ORDER BY r.conname\n"`
`4453`	`4453`	`" ), ' ') as \"%s\"",`
`4454`	`4454`	`gettext_noop("Schema"),`
`4455`	`4455`	`gettext_noop("Name"),`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -789,7 +789,7 @@ alter domain con add check (VALUE > 0);`
`789`	`789`	`List of domains`
`790`	`790`	`Schema \| Name \| Type \| Collation \| Nullable \| Default \| Check`
`791`	`791`	`--------+------+---------+-----------+----------+---------+--------------------------------------`
`792`		`- public \| con \| integer \| \| \| \| CHECK (VALUE< 34) CHECK (VALUE> 0)`
	`792`	`+ public \| con \| integer \| \| \| \| CHECK (VALUE> 0) CHECK (VALUE< 34)`
`793`	`793`	`(1 row)`
`794`	`794`
`795`	`795`	`insert into domcontest values (-5); -- fails`

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!

Commit6ff21c0

File tree

2 files changed

2 files changed

`‎src/bin/psql/describe.c`

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

0 commit comments