agora inbox for pgsql-hackers@postgresql.orghelp / color / mirror / Atom feed
[PATCH v11 2/7] Row pattern recognition patch (parse/analysis). 327+ messages / 2 participants [nested] [flat]
* [PATCH v11 2/7] Row pattern recognition patch (parse/analysis). @ 2023-11-08 06:57 Tatsuo Ishii <ishii@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Tatsuo Ishii @ 2023-11-08 06:57 UTC (permalink / raw) --- src/backend/parser/parse_agg.c | 7 + src/backend/parser/parse_clause.c | 278 +++++++++++++++++++++++++++++- src/backend/parser/parse_expr.c | 4 + src/backend/parser/parse_func.c | 3 + 4 files changed, 291 insertions(+), 1 deletion(-) diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c index 9bbad33fbd..28fb5e0d71 100644 --- a/src/backend/parser/parse_agg.c +++ b/src/backend/parser/parse_agg.c @@ -575,6 +575,10 @@ check_agglevels_and_constraints(ParseState *pstate, Node *expr) errkind = true; break; + case EXPR_KIND_RPR_DEFINE: + errkind = true; + break; + /* * There is intentionally no default: case here, so that the * compiler will warn if we add a new ParseExprKind without @@ -964,6 +968,9 @@ transformWindowFuncCall(ParseState *pstate, WindowFunc *wfunc, case EXPR_KIND_CYCLE_MARK: errkind = true; break; + case EXPR_KIND_RPR_DEFINE: + errkind = true; + break; /* * There is intentionally no default: case here, so that the diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index 334b9b42bd..c5d3c10683 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -100,7 +100,10 @@ static WindowClause *findWindowClause(List *wclist, const char *name); static Node *transformFrameOffset(ParseState *pstate, int frameOptions, Oid rangeopfamily, Oid rangeopcintype, Oid *inRangeFunc, Node *clause); - +static void transformRPR(ParseState *pstate, WindowClause *wc, WindowDef *windef, List **targetlist); +static List *transformDefineClause(ParseState *pstate, WindowClause *wc, WindowDef *windef, List **targetlist); +static void transformPatternClause(ParseState *pstate, WindowClause *wc, WindowDef *windef); +static List *transformMeasureClause(ParseState *pstate, WindowClause *wc, WindowDef *windef); /* * transformFromClause - @@ -2950,6 +2953,10 @@ transformWindowDefinitions(ParseState *pstate, rangeopfamily, rangeopcintype, &wc->endInRangeFunc, windef->endOffset); + + /* Process Row Pattern Recognition related clauses */ + transformRPR(pstate, wc, windef, targetlist); + wc->runCondition = NIL; wc->winref = winref; @@ -3815,3 +3822,272 @@ transformFrameOffset(ParseState *pstate, int frameOptions, return node; } + +/* + * transformRPR + * Process Row Pattern Recognition related clauses + */ +static void +transformRPR(ParseState *pstate, WindowClause *wc, WindowDef *windef, List **targetlist) +{ + /* + * Window definition exists? + */ + if (windef == NULL) + return; + + /* + * Row Pattern Common Syntax clause exists? + */ + if (windef->rpCommonSyntax == NULL) + return; + + /* Check Frame option. Frame must start at current row */ + if ((wc->frameOptions & FRAMEOPTION_START_CURRENT_ROW) == 0) + ereport(ERROR, + (errcode(ERRCODE_SYNTAX_ERROR), + errmsg("FRAME must start at current row when row patttern recognition is used"))); + + /* Transform AFTER MACH SKIP TO clause */ + wc->rpSkipTo = windef->rpCommonSyntax->rpSkipTo; + + /* Transform SEEK or INITIAL clause */ + wc->initial = windef->rpCommonSyntax->initial; + + /* Transform DEFINE clause into list of TargetEntry's */ + wc->defineClause = transformDefineClause(pstate, wc, windef, targetlist); + + /* Check PATTERN clause and copy to patternClause */ + transformPatternClause(pstate, wc, windef); + + /* Transform MEASURE clause */ + transformMeasureClause(pstate, wc, windef); +} + +/* + * transformDefineClause Process DEFINE clause and transform ResTarget into + * list of TargetEntry. + * + * XXX we only support column reference in row pattern definition search + * condition, e.g. "price". <row pattern definition variable name>.<column + * reference> is not supported, e.g. "A.price". + */ +static List * +transformDefineClause(ParseState *pstate, WindowClause *wc, WindowDef *windef, List **targetlist) +{ + /* DEFINE variable name initials */ + static char *defineVariableInitials = "abcdefghijklmnopqrstuvwxyz"; + + ListCell *lc, *l; + ResTarget *restarget, *r; + List *restargets; + List *defineClause; + char *name; + int initialLen; + int i; + + /* + * If Row Definition Common Syntax exists, DEFINE clause must exist. + * (the raw parser should have already checked it.) + */ + Assert(windef->rpCommonSyntax->rpDefs != NULL); + + /* + * Check and add "A AS A IS TRUE" if pattern variable is missing in DEFINE + * per the SQL standard. + */ + restargets = NIL; + foreach(lc, windef->rpCommonSyntax->rpPatterns) + { + A_Expr *a; + bool found = false; + + if (!IsA(lfirst(lc), A_Expr)) + ereport(ERROR, + errmsg("node type is not A_Expr")); + + a = (A_Expr *)lfirst(lc); + name = strVal(a->lexpr); + + foreach(l, windef->rpCommonSyntax->rpDefs) + { + restarget = (ResTarget *)lfirst(l); + + if (!strcmp(restarget->name, name)) + { + found = true; + break; + } + } + + if (!found) + { + /* + * "name" is missing. So create "name AS name IS TRUE" ResTarget + * node and add it to the temporary list. + */ + A_Const *n; + + restarget = makeNode(ResTarget); + n = makeNode(A_Const); + n->val.boolval.type = T_Boolean; + n->val.boolval.boolval = true; + n->location = -1; + restarget->name = pstrdup(name); + restarget->indirection = NIL; + restarget->val = (Node *)n; + restarget->location = -1; + restargets = lappend((List *)restargets, restarget); + } + } + + if (list_length(restargets) >= 1) + { + /* add missing DEFINEs */ + windef->rpCommonSyntax->rpDefs = list_concat(windef->rpCommonSyntax->rpDefs, + restargets); + list_free(restargets); + } + + /* + * Check for duplicate row pattern definition variables. The standard + * requires that no two row pattern definition variable names shall be + * equivalent. + */ + restargets = NIL; + foreach(lc, windef->rpCommonSyntax->rpDefs) + { + restarget = (ResTarget *)lfirst(lc); + name = restarget->name; + + /* + * Add DEFINE expression (Restarget->val) to the targetlist as a + * TargetEntry if it does not exist yet. Planner will add the column + * ref var node to the outer plan's target list later on. This makes + * DEFINE expression could access the outer tuple while evaluating + * PATTERN. + * + * XXX: adding whole expressions of DEFINE to the plan.targetlist is + * not so good, because it's not necessary to evalute the expression + * in the target list while running the plan. We should extract the + * var nodes only then add them to the plan.targetlist. + */ + findTargetlistEntrySQL99(pstate, (Node *)restarget->val, targetlist, EXPR_KIND_RPR_DEFINE); + + /* + * Make sure that the row pattern definition search condition is a + * boolean expression. + */ + transformWhereClause(pstate, restarget->val, + EXPR_KIND_RPR_DEFINE, "DEFINE"); + + foreach(l, restargets) + { + char *n; + + r = (ResTarget *) lfirst(l); + n = r->name; + + if (!strcmp(n, name)) + ereport(ERROR, + (errcode(ERRCODE_SYNTAX_ERROR), + errmsg("row pattern definition variable name \"%s\" appears more than once in DEFINE clause", + name), + parser_errposition(pstate, exprLocation((Node *)r)))); + } + restargets = lappend(restargets, restarget); + } + list_free(restargets); + + /* + * Create list of row pattern DEFINE variable name's initial. + * We assign [a-z] to them (up to 26 variable names are allowed). + */ + restargets = NIL; + i = 0; + initialLen = strlen(defineVariableInitials); + + foreach(lc, windef->rpCommonSyntax->rpDefs) + { + char initial[2]; + + restarget = (ResTarget *)lfirst(lc); + name = restarget->name; + + if (i >= initialLen) + { + ereport(ERROR, + (errcode(ERRCODE_SYNTAX_ERROR), + errmsg("number of row pattern definition variable names exceeds %d", initialLen), + parser_errposition(pstate, exprLocation((Node *)restarget)))); + } + initial[0] = defineVariableInitials[i++]; + initial[1] = '\0'; + wc->defineInitial = lappend(wc->defineInitial, makeString(pstrdup(initial))); + } + + defineClause = transformTargetList(pstate, windef->rpCommonSyntax->rpDefs, + EXPR_KIND_RPR_DEFINE); + + /* mark column origins */ + markTargetListOrigins(pstate, defineClause); + + /* mark all nodes in the DEFINE clause tree with collation information */ + assign_expr_collations(pstate, (Node *)defineClause); + + return defineClause; +} + +/* + * transformPatternClause + * Process PATTERN clause and return PATTERN clause in the raw parse tree + */ +static void +transformPatternClause(ParseState *pstate, WindowClause *wc, WindowDef *windef) +{ + ListCell *lc; + + /* + * Row Pattern Common Syntax clause exists? + */ + if (windef->rpCommonSyntax == NULL) + return; + + wc->patternVariable = NIL; + wc->patternRegexp = NIL; + foreach(lc, windef->rpCommonSyntax->rpPatterns) + { + A_Expr *a; + char *name; + char *regexp; + + if (!IsA(lfirst(lc), A_Expr)) + ereport(ERROR, + errmsg("node type is not A_Expr")); + + a = (A_Expr *)lfirst(lc); + name = strVal(a->lexpr); + + wc->patternVariable = lappend(wc->patternVariable, makeString(pstrdup(name))); + regexp = strVal(lfirst(list_head(a->name))); + wc->patternRegexp = lappend(wc->patternRegexp, makeString(pstrdup(regexp))); + } +} + +/* + * transformMeasureClause + * Process MEASURE clause + * XXX MEASURE clause is not supported yet + */ +static List * +transformMeasureClause(ParseState *pstate, WindowClause *wc, WindowDef *windef) +{ + if (windef->rowPatternMeasures == NIL) + return NIL; + + ereport(ERROR, + (errcode(ERRCODE_SYNTAX_ERROR), + errmsg("%s","MEASURE clause is not supported yet"), + parser_errposition(pstate, exprLocation((Node *)windef->rowPatternMeasures)))); + return NIL; +} diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c index 64c582c344..18b58ac263 100644 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -557,6 +557,7 @@ transformColumnRef(ParseState *pstate, ColumnRef *cref) case EXPR_KIND_COPY_WHERE: case EXPR_KIND_GENERATED_COLUMN: case EXPR_KIND_CYCLE_MARK: + case EXPR_KIND_RPR_DEFINE: /* okay */ break; @@ -1770,6 +1771,7 @@ transformSubLink(ParseState *pstate, SubLink *sublink) case EXPR_KIND_VALUES: case EXPR_KIND_VALUES_SINGLE: case EXPR_KIND_CYCLE_MARK: + case EXPR_KIND_RPR_DEFINE: /* okay */ break; case EXPR_KIND_CHECK_CONSTRAINT: @@ -3149,6 +3151,8 @@ ParseExprKindName(ParseExprKind exprKind) return "GENERATED AS"; case EXPR_KIND_CYCLE_MARK: return "CYCLE"; + case EXPR_KIND_RPR_DEFINE: + return "DEFINE"; /* * There is intentionally no default: case here, so that the diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c index 6c29471bb3..086431f91b 100644 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@ -2656,6 +2656,9 @@ check_srf_call_placement(ParseState *pstate, Node *last_srf, int location) case EXPR_KIND_CYCLE_MARK: errkind = true; break; + case EXPR_KIND_RPR_DEFINE: + errkind = true; + break; /* * There is intentionally no default: case here, so that the -- 2.25.1 ----Next_Part(Wed_Nov__8_16_37_05_2023_872)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="v11-0003-Row-pattern-recognition-patch-planner.patch" ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump @ 2026-07-08 21:39 Nathan Bossart <nathan@postgresql.org> 0 siblings, 0 replies; 327+ messages in thread From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw) --- .../perl/PostgreSQL/Test/AdjustUpgrade.pm | 207 +----------------- 1 file changed, 5 insertions(+), 202 deletions(-) diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm index 878fcc16a9e..04844298ab3 100644 --- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm +++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm @@ -199,15 +199,10 @@ sub adjust_database_contents 'drop operator if exists #@%# (bigint,NONE)'); # get rid of dblink's dependencies on regress.so - my $regrdb = - $old_version le '9.4' - ? 'contrib_regression' - : 'contrib_regression_dblink'; - - if ($dbnames{$regrdb}) + if ($dbnames{'contrib_regression_dblink'}) { _add_st( - $result, $regrdb, + $result, 'contrib_regression_dblink', 'drop function if exists public.putenv(text)', 'drop function if exists public.wait_pid(integer)'); } @@ -250,7 +245,7 @@ sub adjust_database_contents } # this table had OIDs too, but we'll just drop it - if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'}) + if ($dbnames{'contrib_regression_postgres_fdw'}) { _add_st( $result, @@ -276,43 +271,13 @@ sub adjust_database_contents 'drop function if exists public.funny_dup17()'); } - # version-0 C functions are no longer supported - if ($old_version < 10) - { - _add_st($result, 'regression', - 'drop function oldstyle_length(integer, text)'); - } - - if ($old_version lt '9.5') - { - # cope with changes of underlying functions - _add_st( - $result, - 'regression', - 'drop operator @#@ (NONE, bigint)', - 'CREATE OPERATOR @#@ (' - . 'PROCEDURE = factorial, RIGHTARG = bigint )', - 'drop aggregate public.array_cat_accum(anyarray)', - 'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( ' - . ' sfunc = array_larger, ' - . ' stype = anyarray, ' - . ' initcond = $${}$$ ' . ' ) '); - - # "=>" is no longer valid as an operator name - _add_st($result, 'regression', - 'drop operator if exists public.=> (bigint, NONE)'); - } - # Version 19 changed the output format of pg_lsn. To avoid output # differences, set all pg_lsn columns to NULL if the old version is # older than 19. if ($old_version < 19) { - if ($old_version >= '9.5') - { - _add_st($result, 'regression', - "update brintest set lsncol = NULL"); - } + _add_st($result, 'regression', + "update brintest set lsncol = NULL"); if ($old_version >= 12) { @@ -426,107 +391,6 @@ sub adjust_old_dumpfile /$1 EXECUTE FUNCTION/mgx; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - if ($old_version lt '9.6') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = - "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t"; - my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'"; - my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - - $prefix = - "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t"; - $orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'"; - $repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'"; - $dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg; - } - - if ($old_version lt '9.5') - { - # adjust some places where we don't print so many parens anymore - - my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]"; - my $orig = "((x > 3) AND (y <> 'check failed'::text))"; - my $repl = "(x > 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $prefix = "CONSTRAINT insert_con CHECK [(][(]"; - $orig = "((x >= 3) AND (y <> 'check failed'::text))"; - $repl = "(x >= 3) AND (y <> 'check failed'::text)"; - $dump =~ s/($prefix)\Q$orig\E/$1$repl/mg; - - $orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))"; - $repl = - "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))"; - $dump =~ s/\Q$orig\E/$repl/mg; - - my $expr = - "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - - $expr = - "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)"; - $dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - - # _mash_view_whitespace doesn't handle multi-command rules; - # rather than trying to fix that, just hack the exceptions manually. - - my $prefix = - "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);"; - my $line2 = " DELETE FROM public.rtest_admin"; - my $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - $prefix = - "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);"; - $line2 = " UPDATE public.rtest_admin SET sysname = new.sysname"; - $line3 = " WHERE (rtest_admin.sysname = old.sysname);"; - $dump =~ - s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg; - - # and there's one place where pre-9.3 uses a different table alias - $dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s - ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s - WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s - (WHERE\s\(\(rule_and_refint_t3) - (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3) - (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)} - {$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx; - - # Also fix old use of NATURAL JOIN syntax - $dump =~ s {NATURAL JOIN public\.credit_card r} - {JOIN public.credit_card r USING (cid)}mg; - $dump =~ s {NATURAL JOIN public\.credit_usage r} - {JOIN public.credit_usage r USING (cid)}mg; - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; @@ -661,37 +525,6 @@ sub _mash_view_qualifiers return $dump; } - -# Internal subroutine to mangle whitespace within view/rule commands. -# Any consecutive sequence of whitespace is reduced to one space. -sub _mash_view_whitespace -{ - my ($dump) = @_; - - foreach my $leader ('CREATE VIEW', 'CREATE RULE') - { - my @splitchunks = split $leader, $dump; - - $dump = shift(@splitchunks); - foreach my $chunk (@splitchunks) - { - my @thischunks = split /;/, $chunk, 2; - my $stmt = shift(@thischunks); - - # now $stmt is just the body of the CREATE VIEW/RULE - $stmt =~ s/\s+/ /sg; - # we also need to smash these forms for sub-selects and rules - $stmt =~ s/\( SELECT/(SELECT/g; - $stmt =~ s/\( INSERT/(INSERT/g; - $stmt =~ s/\( UPDATE/(UPDATE/g; - $stmt =~ s/\( DELETE/(DELETE/g; - - $dump .= $leader . $stmt . ';' . $thischunks[0]; - } - } - return $dump; -} - =pod =item adjust_new_dumpfile($old_version, $dump) @@ -779,36 +612,6 @@ sub adjust_new_dumpfile $dump =~ s/^SET default_table_access_method = heap;\n//mg; } - # During pg_upgrade, we reindex hash indexes if the source is pre-v10. - # This may change their tables' relallvisible values, so don't compare - # those. - if ($old_version < 10) - { - $dump =~ s/ - (^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\( - [^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass, - [^;]*'relallvisible',)\s'\d+'::integer - /$1 ''::integer/mgx; - } - - # dumps from pre-9.6 dblink may include redundant ACL settings - if ($old_version lt '9.6') - { - my $comment = - "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*"; - my $sql = - "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;"; - $dump =~ s/^--\n$comment\n--\n+$sql\n+//mg; - } - - if ($old_version lt '9.3') - { - # CREATE VIEW/RULE statements were not pretty-printed before 9.3. - # To cope, reduce all whitespace sequences within them to one space. - # This must be done on both old and new dumps. - $dump = _mash_view_whitespace($dump); - } - # Suppress blank lines, as some places in pg_dump emit more or fewer. $dump =~ s/\n\n+/\n/g; -- 2.50.1 (Apple Git-155) --WhtY6+QncUkBAPlR-- ^ permalink raw reply [nested|flat] 327+ messages in thread
end of thread, other threads:[~2026-07-08 21:39 UTC | newest] Thread overview: 327+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2023-11-08 06:57 [PATCH v11 2/7] Row pattern recognition patch (parse/analysis). Tatsuo Ishii <ishii@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org> 2026-07-08 21:39 [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump Nathan Bossart <nathan@postgresql.org>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox