Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf9e439b

Browse files
committed
Correctly handle owned sequences with extensions
With the refactoring of pg_dump to handle components, getOwnedSeqs needsto be a bit more intelligent regarding which components to dump when.Specifically, we can't simply use the owning table's components as theset of components to dump as the table might only be including certaincomponents while all components of the sequence should be dumped, forexample, when the table is a member of an extension while the sequenceis not.Handle this by combining the set of components to be dumped for thesequence explicitly and those to be dumped for the table when settingthe components to be dumped for the sequence.Also add a number of regression tests around this to, hopefully, catchany future changes which break the expected behavior.Discovered by: Philippe BEAUDOINReviewed by: Michael Paquier
1 parent6335c80 commitf9e439b

File tree

4 files changed

+155
-9
lines changed

4 files changed

+155
-9
lines changed

‎src/bin/pg_dump/pg_dump.c

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6035,14 +6035,27 @@ getOwnedSeqs(Archive *fout, TableInfo tblinfo[], int numTables)
60356035

60366036
if (!OidIsValid(seqinfo->owning_tab))
60376037
continue;/* not an owned sequence */
6038-
if (seqinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
6039-
continue;/* no need to search */
6038+
60406039
owning_tab = findTableByOid(seqinfo->owning_tab);
6041-
if (owning_tab && owning_tab->dobj.dump)
6042-
{
6040+
6041+
/*
6042+
* We need to dump the components that are being dumped for the table
6043+
* and any components which the sequence is explicitly marked with.
6044+
*
6045+
* We can't simply use the set of components which are being dumped for
6046+
* the table as the table might be in an extension (and only the
6047+
* non-extension components, eg: ACLs if changed, security labels, and
6048+
* policies, are being dumped) while the sequence is not (and therefore
6049+
* the definition and other components should also be dumped).
6050+
*
6051+
* If the sequence is part of the extension then it should be properly
6052+
* marked by checkExtensionMembership() and this will be a no-op as the
6053+
* table will be equivalently marked.
6054+
*/
6055+
seqinfo->dobj.dump = seqinfo->dobj.dump | owning_tab->dobj.dump;
6056+
6057+
if (seqinfo->dobj.dump != DUMP_COMPONENT_NONE)
60436058
seqinfo->interesting = true;
6044-
seqinfo->dobj.dump = DUMP_COMPONENT_ALL;
6045-
}
60466059
}
60476060
}
60486061

@@ -16465,7 +16478,7 @@ dumpSequence(Archive *fout, TableInfo *tbinfo)
1646516478
{
1646616479
TableInfo *owning_tab = findTableByOid(tbinfo->owning_tab);
1646716480

16468-
if (owning_tab && owning_tab->dobj.dump)
16481+
if (owning_tab && owning_tab->dobj.dump & DUMP_COMPONENT_DEFINITION)
1646916482
{
1647016483
resetPQExpBuffer(query);
1647116484
appendPQExpBuffer(query, "ALTER SEQUENCE %s",

‎src/bin/pg_dump/t/002_pg_dump.pl

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,56 @@
361361
only_dump_test_schema=> 1,
362362
only_dump_test_table=> 1,
363363
test_schema_plus_blobs=> 1, }, },
364+
'ALTER SEQUENCE test_table_col1_seq'=> {
365+
regexp=>qr/^
366+
\QALTER SEQUENCE test_table_col1_seq OWNED BY test_table.col1;\E
367+
/xm,
368+
like=> {
369+
binary_upgrade=> 1,
370+
clean=> 1,
371+
clean_if_exists=> 1,
372+
createdb=> 1,
373+
defaults=> 1,
374+
exclude_test_table_data=> 1,
375+
no_privs=> 1,
376+
no_owner=> 1,
377+
only_dump_test_schema=> 1,
378+
only_dump_test_table=> 1,
379+
pg_dumpall_dbprivs=> 1,
380+
schema_only=> 1,
381+
section_pre_data=> 1,
382+
test_schema_plus_blobs=> 1, },
383+
unlike=> {
384+
exclude_test_table=> 1,
385+
exclude_dump_test_schema=> 1,
386+
pg_dumpall_globals=> 1,
387+
pg_dumpall_globals_clean=> 1,
388+
section_post_data=> 1, }, },
389+
'ALTER SEQUENCE test_third_table_col1_seq'=> {
390+
regexp=>qr/^
391+
\QALTER SEQUENCE test_third_table_col1_seq OWNED BY test_third_table.col1;\E
392+
/xm,
393+
like=> {
394+
binary_upgrade=> 1,
395+
clean=> 1,
396+
clean_if_exists=> 1,
397+
createdb=> 1,
398+
defaults=> 1,
399+
exclude_dump_test_schema=> 1,
400+
exclude_test_table=> 1,
401+
exclude_test_table_data=> 1,
402+
no_privs=> 1,
403+
no_owner=> 1,
404+
pg_dumpall_dbprivs=> 1,
405+
schema_only=> 1,
406+
section_pre_data=> 1, },
407+
unlike=> {
408+
only_dump_test_schema=> 1,
409+
only_dump_test_table=> 1,
410+
pg_dumpall_globals=> 1,
411+
pg_dumpall_globals_clean=> 1,
412+
section_post_data=> 1,
413+
test_schema_plus_blobs=> 1, }, },
364414
'ALTER TABLE ONLY test_table ADD CONSTRAINT ... PRIMARY KEY'=> {
365415
regexp=>qr/^
366416
\QALTER TABLE ONLY test_table\E\n^\s+

‎src/test/modules/test_pg_dump/t/001_base.pl

Lines changed: 80 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,52 @@
223223
schema_only=> 1,
224224
section_pre_data=> 1,
225225
section_post_data=> 1, }, },
226+
'CREATE SEQUENCE regress_pg_dump_table_col1_seq'=> {
227+
regexp=>qr/^
228+
\QCREATE SEQUENCE regress_pg_dump_table_col1_seq\E
229+
\n\s+\QSTART WITH 1\E
230+
\n\s+\QINCREMENT BY 1\E
231+
\n\s+\QNO MINVALUE\E
232+
\n\s+\QNO MAXVALUE\E
233+
\n\s+\QCACHE 1;\E
234+
$/xm,
235+
like=> {binary_upgrade=> 1, },
236+
unlike=> {
237+
clean=> 1,
238+
clean_if_exists=> 1,
239+
createdb=> 1,
240+
defaults=> 1,
241+
no_privs=> 1,
242+
no_owner=> 1,
243+
pg_dumpall_globals=> 1,
244+
schema_only=> 1,
245+
section_pre_data=> 1,
246+
section_post_data=> 1, }, },
247+
'CREATE SEQUENCE regress_pg_dump_seq'=> {
248+
regexp=>qr/^
249+
\QCREATE SEQUENCE regress_pg_dump_seq\E
250+
\n\s+\QSTART WITH 1\E
251+
\n\s+\QINCREMENT BY 1\E
252+
\n\s+\QNO MINVALUE\E
253+
\n\s+\QNO MAXVALUE\E
254+
\n\s+\QCACHE 1;\E
255+
$/xm,
256+
like=> {binary_upgrade=> 1, },
257+
unlike=> {
258+
clean=> 1,
259+
clean_if_exists=> 1,
260+
createdb=> 1,
261+
defaults=> 1,
262+
no_privs=> 1,
263+
no_owner=> 1,
264+
pg_dumpall_globals=> 1,
265+
schema_only=> 1,
266+
section_pre_data=> 1,
267+
section_post_data=> 1, }, },
226268
'CREATE TABLE regress_pg_dump_table'=> {
227269
regexp=>qr/^
228270
\QCREATE TABLE regress_pg_dump_table (\E
229-
\n\s+\Qcol1 integer,\E
271+
\n\s+\Qcol1 integer NOT NULL,\E
230272
\n\s+\Qcol2 integer\E
231273
\n\);$/xm,
232274
like => { binary_upgrade => 1, },
@@ -331,6 +373,43 @@
331373
no_privs => 1,
332374
pg_dumpall_globals => 1,
333375
section_post_data => 1, }, },
376+
'GRANT USAGE ON regress_pg_dump_table_col1_seq TO regress_dump_test_role' => {
377+
create_order => 5,
378+
create_sql => 'GRANT USAGE ON SEQUENCE regress_pg_dump_table_col1_seq
379+
TO regress_dump_test_role;',
380+
regexp => qr/^
381+
\QGRANT USAGE ON SEQUENCE regress_pg_dump_table_col1_seq TO regress_dump_test_role;\E
382+
$/xm,
383+
like => {
384+
binary_upgrade => 1,
385+
clean => 1,
386+
clean_if_exists => 1,
387+
createdb => 1,
388+
defaults => 1,
389+
no_owner => 1,
390+
schema_only => 1,
391+
section_pre_data => 1, },
392+
unlike => {
393+
no_privs => 1,
394+
pg_dumpall_globals => 1,
395+
section_post_data => 1, }, },
396+
'GRANT USAGE ON regress_pg_dump_seq TO regress_dump_test_role' => {
397+
regexp => qr/^
398+
\QGRANT USAGE ON SEQUENCE regress_pg_dump_seq TO regress_dump_test_role;\E
399+
$/xm,
400+
like => {
401+
binary_upgrade => 1, },
402+
unlike => {
403+
clean => 1,
404+
clean_if_exists => 1,
405+
createdb => 1,
406+
defaults => 1,
407+
no_owner => 1,
408+
no_privs => 1,
409+
pg_dumpall_globals => 1,
410+
schema_only => 1,
411+
section_pre_data => 1,
412+
section_post_data => 1, }, },
334413
'REVOKE SELECT(col1) ON regress_pg_dump_table' => {
335414
create_order => 3,
336415
create_sql => 'REVOKE SELECT(col1) ON regress_pg_dump_table

‎src/test/modules/test_pg_dump/test_pg_dump--1.0.sql

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@
44
\echo Use"CREATE EXTENSION test_pg_dump" to load this file. \quit
55

66
CREATETABLEregress_pg_dump_table (
7-
col1int,
7+
col1serial,
88
col2int
99
);
1010

11+
CREATESEQUENCEregress_pg_dump_seq;
12+
13+
GRANT USAGEON regress_pg_dump_seq TO regress_dump_test_role;
14+
1115
GRANTSELECTON regress_pg_dump_table TO regress_dump_test_role;
1216
GRANTSELECT(col1)ON regress_pg_dump_table TO public;
1317

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp