proisstrict must be assumed FALSE when dumping from a 7.0 database,

not TRUE.  Otherwise we break pl call handler functions.  fmgr_oldstyle
will take care of making sure the semantics are the same for C functions.
Clean up some slightly grotty coding in 7.0 pg_class reading, also.

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index d11f52efe8b901a2a7578763cb8869a001adc0af..88f9304e3d48db569320007f9fcc6d754e4df763 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -1928,7 +1928,7 @@ getFuncs(int *numFuncs)
                   "SELECT pg_proc.oid, proname, prolang, pronargs, prorettype, "
                                          "proretset, proargtypes, prosrc, probin, "
                                "(select usename from pg_user where proowner = usesysid) as usename, "
-                               "proiscachable, 't'::boolean as proisstrict "
+                               "proiscachable, 'f'::boolean as proisstrict "
                                "from pg_proc "
                                "where pg_proc.oid > '%u'::oid",
                                          g_last_builtin_oid);
@@ -2056,7 +2056,7 @@ getTables(int *numTables, FuncInfo *finfo, int numFuncs)
        if (g_fout->remoteVersion >= 70100)
        {
                appendPQExpBuffer(query,
-                                         "SELECT pg_class.oid, relname, relkind, relacl, "
+                                         "SELECT pg_class.oid, relname, relacl, relkind, "
                                          "(select usename from pg_user where relowner = usesysid) as usename, "
                                          "relchecks, reltriggers, relhasindex "
                                          "from pg_class "
@@ -2066,22 +2066,23 @@ getTables(int *numTables, FuncInfo *finfo, int numFuncs)
                                          RELKIND_RELATION, RELKIND_SEQUENCE, RELKIND_VIEW);
        } else {
                /* 
-                * In 7.1, view relkind was not set to 'v', so we fake this by checking
-                * if we have a view by looking up pg_class & pg_rewrite.
+                * Before 7.1, view relkind was not set to 'v', so we must check
+                * if we have a view by looking for a rule in pg_rewrite.
                 */
                appendPQExpBuffer(query,
                                          "SELECT c.oid, relname, relacl, "
                                          "CASE WHEN relhasrules and relkind = 'r' "
-                                         "           And EXISTS(SELECT r.rulename FROM pg_rewrite r WHERE "
-                                         "                             r.ev_class = c.oid AND r.ev_type = '1'::\"char\") "
-                                         "THEN 'v'::\"char\" "
-                                         "ELSE relkind End AS relkind,"
-                                         "relacl, (select usename from pg_user where relowner = usesysid) as usename, "
+                                         "  and EXISTS(SELECT rulename FROM pg_rewrite r WHERE "
+                                         "             r.ev_class = c.oid AND r.ev_type = '1') "
+                                         "THEN '%c'::\"char\" "
+                                         "ELSE relkind END AS relkind,"
+                                         "(select usename from pg_user where relowner = usesysid) as usename, "
                                          "relchecks, reltriggers, relhasindex "
                                          "from pg_class c "
                                          "where relname !~ '^pg_' "
                                          "and relkind in ('%c', '%c', '%c') "
                                          "order by oid",
+                                         RELKIND_VIEW,
                                          RELKIND_RELATION, RELKIND_SEQUENCE, RELKIND_VIEW);
        }
 
@@ -2102,8 +2103,8 @@ getTables(int *numTables, FuncInfo *finfo, int numFuncs)
 
        i_reloid = PQfnumber(res, "oid");
        i_relname = PQfnumber(res, "relname");
-       i_relkind = PQfnumber(res, "relkind");
        i_relacl = PQfnumber(res, "relacl");
+       i_relkind = PQfnumber(res, "relkind");
        i_usename = PQfnumber(res, "usename");
        i_relchecks = PQfnumber(res, "relchecks");
        i_reltriggers = PQfnumber(res, "reltriggers");