NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commitd663d3b

Neil Conway

committed

This patch makes \d on tables and views sort fk constraints, triggers

and rules alphabetically in the output. This makes it the same asfor indexes and stops the irritating random or reverse ordering itcurrently has.Chris KL

1 parentf402125 commitd663d3bCopy full SHA for d663d3b

File tree

1 file changed

-6

lines changed

src/bin/psql
- describe.c

1 file changed

-6

lines changed

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

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2005, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.112 2005/02/22 04:40:55 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.113 2005/03/16 23:52:18 neilc Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`	`9`	`#include"describe.h"`
`@@ -959,7 +959,7 @@ describeOneTableDetails(const char *schemaname,`
`959`	`959`	`printfPQExpBuffer(&buf,`
`960`	`960`	`"SELECT r.rulename, trim(trailing ';' from pg_catalog.pg_get_ruledef(r.oid, true))\n"`
`961`	`961`	`"FROM pg_catalog.pg_rewrite r\n"`
`962`		`-"WHERE r.ev_class = '%s' AND r.rulename != '_RETURN'",`
	`962`	`+"WHERE r.ev_class = '%s' AND r.rulename != '_RETURN' ORDER BY 1",`
`963`	`963`	`oid);`
`964`	`964`	`result=PSQLexec(buf.data, false);`
`965`	`965`	`if (!result)`
`@@ -1040,7 +1040,7 @@ describeOneTableDetails(const char *schemaname,`
`1040`	`1040`	`"pg_catalog.pg_get_constraintdef(r.oid, true), "`
`1041`	`1041`	`"conname\n"`
`1042`	`1042`	`"FROM pg_catalog.pg_constraint r\n"`
`1043`		`-"WHERE r.conrelid = '%s' AND r.contype = 'c'",`
	`1043`	`+"WHERE r.conrelid = '%s' AND r.contype = 'c' ORDER BY 1",`
`1044`	`1044`	`oid);`
`1045`	`1045`	`result2=PSQLexec(buf.data, false);`
`1046`	`1046`	`if (!result2)`
`@@ -1058,7 +1058,7 @@ describeOneTableDetails(const char *schemaname,`
`1058`	`1058`	`printfPQExpBuffer(&buf,`
`1059`	`1059`	`"SELECT r.rulename, trim(trailing ';' from pg_catalog.pg_get_ruledef(r.oid, true))\n"`
`1060`	`1060`	`"FROM pg_catalog.pg_rewrite r\n"`
`1061`		`-"WHERE r.ev_class = '%s'",`
	`1061`	`+"WHERE r.ev_class = '%s' ORDER BY 1",`
`1062`	`1062`	`oid);`
`1063`	`1063`	`result3=PSQLexec(buf.data, false);`
`1064`	`1064`	`if (!result3)`
`@@ -1082,7 +1082,8 @@ describeOneTableDetails(const char *schemaname,`
`1082`	`1082`	`" OR NOT EXISTS"`
`1083`	`1083`	`" (SELECT 1 FROM pg_catalog.pg_depend d "`
`1084`	`1084`	`" JOIN pg_catalog.pg_constraint c ON (d.refclassid = c.tableoid AND d.refobjid = c.oid) "`
`1085`		`-" WHERE d.classid = t.tableoid AND d.objid = t.oid AND d.deptype = 'i' AND c.contype = 'f'))",`
	`1085`	`+" WHERE d.classid = t.tableoid AND d.objid = t.oid AND d.deptype = 'i' AND c.contype = 'f'))"`
	`1086`	`+" ORDER BY 1",`
`1086`	`1087`	`oid);`
`1087`	`1088`	`result4=PSQLexec(buf.data, false);`
`1088`	`1089`	`if (!result4)`
`@@ -1103,7 +1104,7 @@ describeOneTableDetails(const char *schemaname,`
`1103`	`1104`	`"SELECT conname,\n"`
`1104`	`1105`	`" pg_catalog.pg_get_constraintdef(oid, true) as condef\n"`
`1105`	`1106`	`"FROM pg_catalog.pg_constraint r\n"`
`1106`		`-"WHERE r.conrelid = '%s' AND r.contype = 'f'",`
	`1107`	`+"WHERE r.conrelid = '%s' AND r.contype = 'f' ORDER BY 1",`
`1107`	`1108`	`oid);`
`1108`	`1109`	`result5=PSQLexec(buf.data, false);`
`1109`	`1110`	`if (!result5)`

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!

Commitd663d3b

File tree

1 file changed

1 file changed

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

0 commit comments