Skip to content

pg_dump: stop overriding --function-oids with the namespace policy #2175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MisterRaindrop wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −6
Open

pg_dump: stop overriding --function-oids with the namespace policy #2175

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/bin/pg_dump/pg_dump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2191,20 +2191,24 @@ selectDumpableType(TypeInfo *tyinfo, Archive *fout)
* Mark a function as to be dumped or not
*/
static void
selectDumpableFunction(FuncInfo *finfo)
selectDumpableFunction(FuncInfo *finfo, Archive *fout)
{
if (checkExtensionMembership(&finfo->dobj, fout))
return; /* extension membership overrides all else */

/*
* If specific functions are being dumped, dump just those functions; else, dump
* according to the parent namespace's dump flag if parent namespace is not null;
* else, always dump the function.
*/
if (function_include_oids.head != NULL)
finfo->dobj.dump = simple_oid_list_member(&function_include_oids,
finfo->dobj.catId.oid);
finfo->dobj.catId.oid) ?
DUMP_COMPONENT_ALL : DUMP_COMPONENT_NONE;
else if (finfo->dobj.namespace)
finfo->dobj.dump = finfo->dobj.namespace->dobj.dump;
finfo->dobj.dump = finfo->dobj.namespace->dobj.dump_contains;
else
finfo->dobj.dump = true;
finfo->dobj.dump = DUMP_COMPONENT_ALL;
}

/*
Expand Down Expand Up @@ -7299,8 +7303,7 @@ getFuncs(Archive *fout, int *numFuncs)
finfo[i].postponed_def = false; /* might get set during sort */

/* Decide whether we want to dump it */
selectDumpableFunction(&finfo[i]);
selectDumpableObject(&(finfo[i].dobj), fout);
selectDumpableFunction(&finfo[i], fout);

/* Mark whether function has an ACL */
if (!PQgetisnull(res, i, i_proacl))
Expand Down
Loading