database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-17 06:41:09 +03:00
Code Activity

Back-patch fix to make pg_dump dump 'iscachable' flag for functions.

Browse Source
This commit is contained in:
Tom Lane
2000-09-23 23:36:17 +00:00
parent de3e0183b8
commit 0e0832b0dd
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
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.147 2000/04/14 01:34:24 tgl Exp $ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.147.2.1 2000/09/23 23:36:17 tgl Exp $
* *
* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
* *
@ -1456,13 +1456,15 @@ getFuncs(int *numFuncs)
int i_proretset; int i_proretset;
int i_prosrc; int i_prosrc;
int i_probin; int i_probin;
int i_iscachable;
int i_usename; int i_usename;
/* find all user-defined funcs */ /* find all user-defined funcs */
appendPQExpBuffer(query, appendPQExpBuffer(query,
"SELECT pg_proc.oid, proname, prolang, pronargs, prorettype, " "SELECT pg_proc.oid, proname, prolang, pronargs, prorettype, "
"proretset, proargtypes, prosrc, probin, usename " "proretset, proargtypes, prosrc, probin, usename, "
"proiscachable "
"from pg_proc, pg_user " "from pg_proc, pg_user "
"where pg_proc.oid > '%u'::oid and proowner = usesysid", "where pg_proc.oid > '%u'::oid and proowner = usesysid",
g_last_builtin_oid); g_last_builtin_oid);
@ -1492,6 +1494,7 @@ getFuncs(int *numFuncs)
i_proretset = PQfnumber(res, "proretset"); i_proretset = PQfnumber(res, "proretset");
i_prosrc = PQfnumber(res, "prosrc"); i_prosrc = PQfnumber(res, "prosrc");
i_probin = PQfnumber(res, "probin"); i_probin = PQfnumber(res, "probin");
i_iscachable = PQfnumber(res, "proiscachable");
i_usename = PQfnumber(res, "usename"); i_usename = PQfnumber(res, "usename");
for (i = 0; i < ntups; i++) for (i = 0; i < ntups; i++)
@ -1507,6 +1510,7 @@ getFuncs(int *numFuncs)
finfo[i].nargs = atoi(PQgetvalue(res, i, i_pronargs)); finfo[i].nargs = atoi(PQgetvalue(res, i, i_pronargs));
finfo[i].lang = atoi(PQgetvalue(res, i, i_prolang)); finfo[i].lang = atoi(PQgetvalue(res, i, i_prolang));
finfo[i].usename = strdup(PQgetvalue(res, i, i_usename)); finfo[i].usename = strdup(PQgetvalue(res, i, i_usename));
finfo[i].iscachable = (strcmp(PQgetvalue(res, i, i_iscachable),"t") == 0);
if (finfo[i].nargs < 0 || finfo[i].nargs > FUNC_MAX_ARGS) if (finfo[i].nargs < 0 || finfo[i].nargs > FUNC_MAX_ARGS)
{ {
fprintf(stderr, "failed sanity check: %s has %d args\n", fprintf(stderr, "failed sanity check: %s has %d args\n",
@ -2663,11 +2667,18 @@ dumpOneFunc(FILE *fout, FuncInfo *finfo, int i,
(j > 0) ? "," : "", (j > 0) ? "," : "",
fmtId(typname, false)); fmtId(typname, false));
} }
appendPQExpBuffer(q, " ) RETURNS %s%s AS '%s' LANGUAGE '%s';\n", appendPQExpBuffer(q, " ) RETURNS %s%s AS '%s' LANGUAGE '%s'",
(finfo[i].retset) ? " SETOF " : "", (finfo[i].retset) ? " SETOF " : "",
fmtId(findTypeByOid(tinfo, numTypes, finfo[i].prorettype), false), fmtId(findTypeByOid(tinfo, numTypes, finfo[i].prorettype), false),
func_def, func_lang); func_def, func_lang);
if (finfo[i].iscachable) /* OR in new attrs here */
{
appendPQExpBuffer(q, " WITH (iscachable)");
}
appendPQExpBuffer(q, ";\n");
fputs(q->data, fout); fputs(q->data, fout);
/*** Dump Function Comments ***/ /*** Dump Function Comments ***/

3
src/bin/pg_dump/pg_dump.h
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: pg_dump.h,v 1.48 2000/04/12 17:16:15 momjian Exp $ * $Id: pg_dump.h,v 1.48.2.1 2000/09/23 23:36:17 tgl Exp $
* *
* Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2 * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
* *
@ -61,6 +61,7 @@ typedef struct _funcInfo
char *prosrc; char *prosrc;
char *probin; char *probin;
char *usename; char *usename;
int iscachable; /* Attr */
int dumped; /* 1 if already dumped */ int dumped; /* 1 if already dumped */
} FuncInfo; } FuncInfo;