rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-10-02 20:36:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Tom Lane 2001-05-12 23:36:03 +00:00
parent 01839df6dd
commit e7c5639226
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/bin/pg_dump/pg_dump.c
View File

@ -22,7 +22,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.206 2001/05/12 01:03:59 pjw Exp $ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.207 2001/05/12 23:36:03 tgl Exp $
* *
* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
* *
@ -1928,7 +1928,7 @@ getFuncs(int *numFuncs)
"SELECT pg_proc.oid, proname, prolang, pronargs, prorettype, " "SELECT pg_proc.oid, proname, prolang, pronargs, prorettype, "
"proretset, proargtypes, prosrc, probin, " "proretset, proargtypes, prosrc, probin, "
"(select usename from pg_user where proowner = usesysid) as usename, " "(select usename from pg_user where proowner = usesysid) as usename, "
"proiscachable, 't'::boolean as proisstrict " "proiscachable, 'f'::boolean as proisstrict "
"from pg_proc " "from pg_proc "
"where pg_proc.oid > '%u'::oid", "where pg_proc.oid > '%u'::oid",
g_last_builtin_oid); g_last_builtin_oid);
@ -2056,7 +2056,7 @@ getTables(int *numTables, FuncInfo *finfo, int numFuncs)
if (g_fout->remoteVersion >= 70100) if (g_fout->remoteVersion >= 70100)
{ {
appendPQExpBuffer(query, 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, " "(select usename from pg_user where relowner = usesysid) as usename, "
"relchecks, reltriggers, relhasindex " "relchecks, reltriggers, relhasindex "
"from pg_class " "from pg_class "
@ -2066,22 +2066,23 @@ getTables(int *numTables, FuncInfo *finfo, int numFuncs)
RELKIND_RELATION, RELKIND_SEQUENCE, RELKIND_VIEW); RELKIND_RELATION, RELKIND_SEQUENCE, RELKIND_VIEW);
} else { } else {
/* /*
* In 7.1, view relkind was not set to 'v', so we fake this by checking * Before 7.1, view relkind was not set to 'v', so we must check
* if we have a view by looking up pg_class & pg_rewrite. * if we have a view by looking for a rule in pg_rewrite.
*/ */
appendPQExpBuffer(query, appendPQExpBuffer(query,
"SELECT c.oid, relname, relacl, " "SELECT c.oid, relname, relacl, "
"CASE WHEN relhasrules and relkind = 'r' " "CASE WHEN relhasrules and relkind = 'r' "
" And EXISTS(SELECT r.rulename FROM pg_rewrite r WHERE " " and EXISTS(SELECT rulename FROM pg_rewrite r WHERE "
" r.ev_class = c.oid AND r.ev_type = '1'::\"char\") " " r.ev_class = c.oid AND r.ev_type = '1') "
"THEN 'v'::\"char\" " "THEN '%c'::\"char\" "
"ELSE relkind End AS relkind," "ELSE relkind END AS relkind,"
"relacl, (select usename from pg_user where relowner = usesysid) as usename, " "(select usename from pg_user where relowner = usesysid) as usename, "
"relchecks, reltriggers, relhasindex " "relchecks, reltriggers, relhasindex "
"from pg_class c " "from pg_class c "
"where relname !~ '^pg_' " "where relname !~ '^pg_' "
"and relkind in ('%c', '%c', '%c') " "and relkind in ('%c', '%c', '%c') "
"order by oid", "order by oid",
RELKIND_VIEW,
RELKIND_RELATION, RELKIND_SEQUENCE, 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_reloid = PQfnumber(res, "oid");
i_relname = PQfnumber(res, "relname"); i_relname = PQfnumber(res, "relname");
i_relkind = PQfnumber(res, "relkind");
i_relacl = PQfnumber(res, "relacl"); i_relacl = PQfnumber(res, "relacl");
i_relkind = PQfnumber(res, "relkind");
i_usename = PQfnumber(res, "usename"); i_usename = PQfnumber(res, "usename");
i_relchecks = PQfnumber(res, "relchecks"); i_relchecks = PQfnumber(res, "relchecks");
i_reltriggers = PQfnumber(res, "reltriggers"); i_reltriggers = PQfnumber(res, "reltriggers");