From 135a507991c8ea9eca201cc084294a689ca24ba9 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Tue, 7 Jun 2011 21:39:43 -0400 Subject: [PATCH] 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. --- src/bin/psql/describe.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index e01fb7bdeb..6f603d4512 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); } } -- 2.40.0