Commitafc2900

committed

Make psql distinguish between unique indices and unique constraints.

Josh Kupershmidt. Reviewing and kibitzing by Kevin Grittner and me.

1 parentb8c798e commitafc2900Copy full SHA for afc2900

File tree

-3

lines changed

-3

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`* Copyright (c) 2000-2010, PostgreSQL Global Development Group`
`10`	`10`	`*`
`11`		`- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.242 2010/07/06 19:18:59 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.243 2010/08/01 01:08:29 rhaas Exp $`
`12`	`12`	`*/`
`13`	`13`	`#include"postgres_fe.h"`
`14`	`14`
`@@ -1592,7 +1592,12 @@ describeOneTableDetails(const char *schemaname,`
`1592`	`1592`	`if (strcmp(PQgetvalue(result,i,1),"t")==0)`
`1593`	`1593`	`appendPQExpBuffer(&buf," PRIMARY KEY,");`
`1594`	`1594`	`elseif (strcmp(PQgetvalue(result,i,2),"t")==0)`
`1595`		`-appendPQExpBuffer(&buf," UNIQUE,");`
	`1595`	`+{`
	`1596`	`+if (strcmp(PQgetvalue(result,i,7),"u")==0)`
	`1597`	`+appendPQExpBuffer(&buf," UNIQUE CONSTRAINT,");`
	`1598`	`+else`
	`1599`	`+appendPQExpBuffer(&buf," UNIQUE,");`
	`1600`	`+}`
`1596`	`1601`
`1597`	`1602`	`/* Everything after "USING" is echoed verbatim */`
`1598`	`1603`	`indexdef=PQgetvalue(result,i,5);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ NOTICE: CREATE TABLE / UNIQUE will create implicit index "persons2_name_key" fo`
`55`	`55`	`name \| text \|`
`56`	`56`	`Indexes:`
`57`	`57`	`"persons2_pkey" PRIMARY KEY, btree (id)`
`58`		`- "persons2_name_key" UNIQUE, btree (name)`
	`58`	`+ "persons2_name_key" UNIQUE CONSTRAINT, btree (name)`
`59`	`59`	`Typed table of type: person_type`
`60`	`60`
`61`	`61`	`CREATE TABLE persons3 OF person_type (`

Comments

(0)