database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-03 22:24:49 +03:00
Code

- Support for iscachable when dumping functions

Browse Source
This commit is contained in:
Philip Warner 2000-08-07 12:32:54 +00:00
parent 7f6e021ca8
commit 74e3311085
2 changed files with 16 additions and 4 deletions
Show Stats 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.162 2000/08/01 15:51:44 pjw Exp $ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.163 2000/08/07 12:32:54 pjw Exp $
* *
* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
* *
@ -1714,13 +1714,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);
@ -1751,6 +1753,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++)
@ -1766,6 +1769,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",
@ -2923,11 +2927,18 @@ dumpOneFunc(Archive *fout, FuncInfo *finfo, int i,
resetPQExpBuffer(q); resetPQExpBuffer(q);
appendPQExpBuffer(q, "CREATE FUNCTION %s ", fn->data ); appendPQExpBuffer(q, "CREATE FUNCTION %s ", fn->data );
appendPQExpBuffer(q, "RETURNS %s%s %s LANGUAGE '%s';\n", appendPQExpBuffer(q, "RETURNS %s%s %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),
asPart->data, func_lang); asPart->data, func_lang);
if (finfo[i].iscachable) /* OR in new attrs here */
{
appendPQExpBuffer(q, " WITH (iscachable)");
}
appendPQExpBuffer(q, ";\n");
ArchiveEntry(fout, finfo[i].oid, fn->data, "FUNCTION", NULL, q->data, delqry->data, ArchiveEntry(fout, finfo[i].oid, fn->data, "FUNCTION", NULL, q->data, delqry->data,
"", finfo[i].usename, NULL, NULL); "", finfo[i].usename, NULL, NULL);

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.50 2000/07/17 03:05:20 tgl Exp $ * $Id: pg_dump.h,v 1.51 2000/08/07 12:32:54 pjw 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
* *
@ -62,6 +62,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;