Fix psql's \dd version check for operator families.
authorRobert Haas <rhaas@postgresql.org>
Sat, 12 Nov 2011 04:33:44 +0000 (23:33 -0500)
committerRobert Haas <rhaas@postgresql.org>
Sat, 12 Nov 2011 04:33:44 +0000 (23:33 -0500)
Report and patch by Josh Kupershmidt; comment revisions by me.

src/bin/psql/describe.c

index b5c14c57672e4438f24ae00d9263e3402f545a13..2ff6d7dc997da21141dd689f091295a48be7e630 100644 (file)
@@ -876,8 +876,7 @@ objectDescription(const char *pattern, bool showSystem)
                                                  "pg_catalog.pg_table_is_visible(c.oid)");
 
        /*
-        * pg_opclass.opcmethod only available in 8.3+, and comment on operator
-        * family only available in 8.3+
+        * pg_opclass.opcmethod only available in 8.3+
         */
        if (pset.sversion >= 80300)
        {
@@ -902,7 +901,14 @@ objectDescription(const char *pattern, bool showSystem)
                processSQLNamePattern(pset.db, &buf, pattern, true, false,
                                                          "n.nspname", "o.opcname", NULL,
                                                          "pg_catalog.pg_opclass_is_visible(o.oid)");
+       }
 
+       /*
+        * although operator family comments have been around since 8.3,
+        * pg_opfamily_is_visible is only available in 9.2+
+        */
+       if (pset.sversion >= 90200)
+       {
                /* Operator family descriptions */
                appendPQExpBuffer(&buf,
                                                  "UNION ALL\n"