pg_dump: Fix dumping of publications

petere · petere · commit de75281637b7 · 2017-03-10T15:31:47.000-05:00
Dumping a publication with more than one table crashed pg_dump.

patch by Amit Langote &lt;Langote_Amit_f8@lab.ntt.co.jp&gt;, test by me
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -3557,6 +3557,7 @@ getPublicationTables(Archive *fout, TableInfo tblinfo[], int numTables)
 			pubrinfo[j].dobj.catId.oid = atooid(PQgetvalue(res, j, i_oid));
 			AssignDumpId(&pubrinfo[j].dobj);
 			pubrinfo[j].dobj.namespace = tbinfo->dobj.namespace;
+			pubrinfo[j].dobj.name = tbinfo->dobj.name;
 			pubrinfo[j].pubname = pg_strdup(PQgetvalue(res, j, i_pubname));
 			pubrinfo[j].pubtable = tbinfo;
 		}
diff --git a/src/bin/pg_dump/t/002_pg_dump.pl b/src/bin/pg_dump/t/002_pg_dump.pl
@@ -2286,6 +2286,34 @@
 			exclude_test_table       => 1,
 			pg_dumpall_globals       => 1,
 			pg_dumpall_globals_clean => 1, }, },
+	'ALTER PUBLICATION pub1 ADD TABLE test_second_table' => {
+		create_order => 52,
+		create_sql =>
+		  'ALTER PUBLICATION pub1 ADD TABLE dump_test.test_second_table;',
+		regexp => qr/^
+			\QALTER PUBLICATION pub1 ADD TABLE test_second_table;\E
+			/xm,
+		like => {
+			binary_upgrade          => 1,
+			clean                   => 1,
+			clean_if_exists         => 1,
+			createdb                => 1,
+			defaults                => 1,
+			exclude_test_table      => 1,
+			exclude_test_table_data => 1,
+			no_privs                => 1,
+			no_owner                => 1,
+			only_dump_test_schema   => 1,
+			pg_dumpall_dbprivs      => 1,
+			schema_only             => 1,
+			section_post_data       => 1,
+			test_schema_plus_blobs  => 1, },
+		unlike => {
+			section_pre_data         => 1,
+			exclude_dump_test_schema => 1,
+			only_dump_test_table     => 1,
+			pg_dumpall_globals       => 1,
+			pg_dumpall_globals_clean => 1, }, },
 
 	'CREATE SCHEMA dump_test' => {
 		all_runs     => 1,

Original file line number	Diff line number	Diff line change
`@@ -3557,6 +3557,7 @@ getPublicationTables(Archive *fout, TableInfo tblinfo[], int numTables)`
`3557`	`3557`	`pubrinfo[j].dobj.catId.oid = atooid(PQgetvalue(res, j, i_oid));`
`3558`	`3558`	`AssignDumpId(&pubrinfo[j].dobj);`
`3559`	`3559`	`pubrinfo[j].dobj.namespace = tbinfo->dobj.namespace;`
	`3560`	`+ pubrinfo[j].dobj.name = tbinfo->dobj.name;`
`3560`	`3561`	`pubrinfo[j].pubname = pg_strdup(PQgetvalue(res, j, i_pubname));`
`3561`	`3562`	`pubrinfo[j].pubtable = tbinfo;`
`3562`	`3563`	`}`