aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlvaro Herrera <alvherre@alvh.no-ip.org>2011-06-07 21:39:43 -0400
committerAlvaro Herrera <alvherre@alvh.no-ip.org>2011-06-07 21:39:43 -0400
commit135a507991c8ea9eca201cc084294a689ca24ba9 (patch)
treec2c737e9cc4a85c4ba47533610a87782b072b17a
parenta31ff707a27b3ed4a1c082c131194995efbbce4b (diff)
downloadpostgresql-135a507991c8ea9eca201cc084294a689ca24ba9.tar.gz
postgresql-135a507991c8ea9eca201cc084294a689ca24ba9.zip
Revert psql bits to display NOT VALID for FKs
These are superseded by pg_get_constraintdef's ability to display the same when appropriate, which is a better place to do it anyway.
-rw-r--r--src/bin/psql/describe.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index e01fb7bdeb1..6f603d4512a 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -1746,10 +1746,8 @@ describeOneTableDetails(const char *schemaname,
{
printfPQExpBuffer(&buf,
"SELECT conname,\n"
- " pg_catalog.pg_get_constraintdef(r.oid, true) as condef\n");
- if (pset.sversion >= 90100)
- appendPQExpBuffer(&buf, " ,convalidated\n");
- appendPQExpBuffer(&buf, "FROM pg_catalog.pg_constraint r\n"
+ " pg_catalog.pg_get_constraintdef(r.oid, true) as condef\n"
+ "FROM pg_catalog.pg_constraint r\n"
"WHERE r.conrelid = '%s' AND r.contype = 'f' ORDER BY 1",
oid);
result = PSQLexec(buf.data, false);
@@ -1768,9 +1766,6 @@ describeOneTableDetails(const char *schemaname,
PQgetvalue(result, i, 0),
PQgetvalue(result, i, 1));
- if (pset.sversion >= 90100 && strcmp(PQgetvalue(result, i, 2), "f") == 0)
- appendPQExpBuffer(&buf, " NOT VALID");
-
printTableAddFooter(&cont, buf.data);
}
}