NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit665cafe

committed

Fix cross-version upgrades with XMLSERIALIZE(NO INDENT)

Dumps from versions older than v16 do not know about NO INDENT in aXMLSERIALIZE() clause. This commit adjusts AdjustUpgrade.pm so as NOINDENT is discarded in the contents of the new dump adjusted forcomparison when the old version is v15 or older. This should be enoughto make the cross-version upgrade tests pass.Per report from buildfarm member crake. Oversight in984410b.Reviewed-by: Andrew Dunstan <andrew@dunslane.net>Discussion:https://postgr.es/m/88b183f1-ebf9-4f51-9144-3704380ccae7@dunslane.netBackpatch-through: 16

1 parent329304c commit665cafeCopy full SHA for 665cafe

File tree

1 file changed

-0

lines changed

src/test/perl/PostgreSQL/Test
- AdjustUpgrade.pm

1 file changed

-0

lines changed

`‎src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -636,6 +636,12 @@ sub adjust_new_dumpfile`
`636`	`636`	`$dump =~s ['version', '\d+'::integer,]`
`637`	`637`	`['version','000000'::integer,]mg;`
`638`	`638`
	`639`	`+# pre-v16 dumps do not know about XMLSERIALIZE(NO INDENT).`
	`640`	`+if ($old_version < 16)`
	`641`	`+{`
	`642`	`+$dump =~s/XMLSERIALIZE$(.*)? NO INDENT$/XMLSERIALIZE$$1$/mg;`
	`643`	`+}`
	`644`	`+`
`639`	`645`	`if ($old_version < 14)`
`640`	`646`	`{`
`641`	`647`	`# Suppress noise-word uses of IN in CREATE/ALTER PROCEDURE.`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit665cafe

File tree

1 file changed

1 file changed

`‎src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm`

0 commit comments