Fix improper usage of 'dump' bitmap

sfrost · sfrost · commit fa6075e5515c · 2016-04-08T16:30:02.000-04:00
Now that 'dump' is a bitmap, we can't simply set it to 'true'.

Noticed while debugging the prior issue.
diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c
@@ -848,9 +848,14 @@ repairTypeFuncLoop(DumpableObject *typeobj, DumpableObject *funcobj)
 	if (typeInfo->shellType)
 	{
 		addObjectDependency(funcobj, typeInfo->shellType->dobj.dumpId);
-		/* Mark shell type as to be dumped if any such function is */
+		/*
+		 * Mark shell type (always including the definition, as we need
+		 * the shell type defined to identify the function fully) as to be
+		 * dumped if any such function is
+		 */
 		if (funcobj->dump)
-			typeInfo->shellType->dobj.dump = true;
+			typeInfo->shellType->dobj.dump = funcobj->dump |
+											 DUMP_COMPONENT_DEFINITION;
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -848,9 +848,14 @@ repairTypeFuncLoop(DumpableObject typeobj, DumpableObject funcobj)`
`848`	`848`	`if (typeInfo->shellType)`
`849`	`849`	`{`
`850`	`850`	`addObjectDependency(funcobj, typeInfo->shellType->dobj.dumpId);`
`851`		`- /* Mark shell type as to be dumped if any such function is */`
	`851`	`+ /*`
	`852`	`+ * Mark shell type (always including the definition, as we need`
	`853`	`+ * the shell type defined to identify the function fully) as to be`
	`854`	`+ * dumped if any such function is`
	`855`	`+ */`
`852`	`856`	`if (funcobj->dump)`
`853`		`- typeInfo->shellType->dobj.dump = true;`
	`857`	`+ typeInfo->shellType->dobj.dump = funcobj->dump \|`
	`858`	`+ DUMP_COMPONENT_DEFINITION;`
`854`	`859`	`}`
`855`	`860`	`}`
`856`	`861`