Make \d order a table's check constraints by constraint name instead

tglsfdc · tglsfdc · commit a5bd1d357a41 · 2005-10-20T05:15:09.000Z
of the text of the constraint condition.  Per Chris K-L, though I didn't
use his patch exactly.
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.127 2005/10/15 02:49:40 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.128 2005/10/20 05:15:09 tgl Exp $
  */
 #include "postgres_fe.h"
 #include "describe.h"
@@ -1036,9 +1036,8 @@ describeOneTableDetails(const char *schemaname,
 		if (tableinfo.checks)
 		{
 			printfPQExpBuffer(&buf,
-							  "SELECT "
-							  "pg_catalog.pg_get_constraintdef(r.oid, true), "
-							  "conname\n"
+							  "SELECT r.conname, "
+							  "pg_catalog.pg_get_constraintdef(r.oid, true)\n"
 							  "FROM pg_catalog.pg_constraint r\n"
 					"WHERE r.conrelid = '%s' AND r.contype = 'c' ORDER BY 1",
 							  oid);
@@ -1192,8 +1191,8 @@ describeOneTableDetails(const char *schemaname,
 			for (i = 0; i < check_count; i++)
 			{
 				printfPQExpBuffer(&buf, _("    \"%s\" %s"),
-								  PQgetvalue(result2, i, 1),
-								  PQgetvalue(result2, i, 0));
+								  PQgetvalue(result2, i, 0),
+								  PQgetvalue(result2, i, 1));
 
 				footers[count_footers++] = pg_strdup(buf.data);
 			}

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.127 2005/10/15 02:49:40 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.128 2005/10/20 05:15:09 tgl Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`	`#include "describe.h"`
`@@ -1036,9 +1036,8 @@ describeOneTableDetails(const char *schemaname,`
`1036`	`1036`	`if (tableinfo.checks)`
`1037`	`1037`	`{`
`1038`	`1038`	`printfPQExpBuffer(&buf,`
`1039`		`- "SELECT "`
`1040`		`- "pg_catalog.pg_get_constraintdef(r.oid, true), "`
`1041`		`- "conname\n"`
	`1039`	`+ "SELECT r.conname, "`
	`1040`	`+ "pg_catalog.pg_get_constraintdef(r.oid, true)\n"`
`1042`	`1041`	`"FROM pg_catalog.pg_constraint r\n"`
`1043`	`1042`	`"WHERE r.conrelid = '%s' AND r.contype = 'c' ORDER BY 1",`
`1044`	`1043`	`oid);`
`@@ -1192,8 +1191,8 @@ describeOneTableDetails(const char *schemaname,`
`1192`	`1191`	`for (i = 0; i < check_count; i++)`
`1193`	`1192`	`{`
`1194`	`1193`	`printfPQExpBuffer(&buf, _(" \"%s\" %s"),`
`1195`		`- PQgetvalue(result2, i, 1),`
`1196`		`- PQgetvalue(result2, i, 0));`
	`1194`	`+ PQgetvalue(result2, i, 0),`
	`1195`	`+ PQgetvalue(result2, i, 1));`
`1197`	`1196`
`1198`	`1197`	`footers[count_footers++] = pg_strdup(buf.data);`
`1199`	`1198`	`}`