]> granicus.if.org Git - postgresql/commitdiff
Revert psql bits to display NOT VALID for FKs
authorAlvaro Herrera <alvherre@alvh.no-ip.org>
Wed, 8 Jun 2011 01:39:43 +0000 (21:39 -0400)
committerAlvaro Herrera <alvherre@alvh.no-ip.org>
Wed, 8 Jun 2011 01:39:43 +0000 (21:39 -0400)
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

index e01fb7bdeb1fec350cbcd2f6724be6db2e40f0ad..6f603d4512a24236499d866c4220f7b34e1ac7d2 100644 (file)
@@ -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);
                                }
                        }