agora inbox for [email protected]  

help / color / mirror / Atom feed

[PATCH] Restructure repack worker teardown
165+ messages / 2 participants
[nested] [flat]

* [PATCH] Restructure repack worker teardown
@ 2026-05-18 17:13 Álvaro Herrera <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Álvaro Herrera @ 2026-05-18 17:13 UTC (permalink / raw)

The original code would leave a shared memory segment unreleased if we
fail partway through initialization.  Change the shutdown order so that
we already free it.

Author: Álvaro Herrera <[email protected]>
Discussion: https://postgr.es/m/[email protected]
---
 src/backend/commands/repack.c | 67 ++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 36 deletions(-)

diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c
index bfc62c8f752..c9064d8fd13 100644
--- a/src/backend/commands/repack.c
+++ b/src/backend/commands/repack.c
@@ -3411,10 +3411,14 @@ start_repack_decoding_worker(Oid relid)
 	shm_mq_handle *mqh;
 	BackgroundWorker bgw;
 
+	decoding_worker = palloc0_object(DecodingWorker);
+
 	/* Setup shared memory. */
 	size = BUFFERALIGN(offsetof(DecodingWorkerShared, error_queue)) +
 		BUFFERALIGN(REPACK_ERROR_QUEUE_SIZE);
 	seg = dsm_create(size, 0);
+	decoding_worker->seg = seg;
+
 	shared = (DecodingWorkerShared *) dsm_segment_address(seg);
 	shared->initialized = false;
 	shared->lsn_upto = InvalidXLogRecPtr;
@@ -3454,14 +3458,12 @@ start_repack_decoding_worker(Oid relid)
 	bgw.bgw_main_arg = UInt32GetDatum(dsm_segment_handle(seg));
 	bgw.bgw_notify_pid = MyProcPid;
 
-	decoding_worker = palloc0_object(DecodingWorker);
 	if (!RegisterDynamicBackgroundWorker(&bgw, &decoding_worker->handle))
 		ereport(ERROR,
 				errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED),
 				errmsg("out of background worker slots"),
 				errhint("You might need to increase \"%s\".", "max_worker_processes"));
 
-	decoding_worker->seg = seg;
 	decoding_worker->error_mqh = mqh;
 
 	/*
@@ -3487,17 +3489,6 @@ start_repack_decoding_worker(Oid relid)
 	ConditionVariableCancelSleep();
 }
 
-/*
- * PG_ENSURE_ERROR_CLEANUP callback to stop the decoding worker.
- * This ensures the worker is terminated on both ERROR and FATAL exits,
- * unlike PG_FINALLY which only handles ERROR.
- */
-static void
-repack_decoding_worker_cleanup_cb(int code, Datum arg)
-{
-	stop_repack_decoding_worker();
-}
-
 /*
  * Stop the decoding worker and cleanup the related resources.
  *
@@ -3508,39 +3499,43 @@ static void
 stop_repack_decoding_worker(void)
 {
 	BgwHandleStatus status;
+	dsm_segment	   *dsmseg;
 
-	/* Haven't reached the worker startup? */
+	/* Nothing to do if no worker was set up. */
 	if (decoding_worker == NULL)
 		return;
 
-	/* Could not register the worker? */
-	if (decoding_worker->handle == NULL)
-		return;
+	/* Terminate the worker process, if one is running. */
+	if (decoding_worker->handle != NULL)
+	{
+		TerminateBackgroundWorker(decoding_worker->handle);
+		/* The worker should really exit before the REPACK command does. */
+		HOLD_INTERRUPTS();
+		status = WaitForBackgroundWorkerShutdown(decoding_worker->handle);
+		RESUME_INTERRUPTS();
 
-	TerminateBackgroundWorker(decoding_worker->handle);
-	/* The worker should really exit before the REPACK command does. */
-	HOLD_INTERRUPTS();
-	status = WaitForBackgroundWorkerShutdown(decoding_worker->handle);
-	RESUME_INTERRUPTS();
-
-	if (status == BGWH_POSTMASTER_DIED)
-		ereport(FATAL,
-				errcode(ERRCODE_ADMIN_SHUTDOWN),
-				errmsg("postmaster exited during REPACK command"));
-
-	shm_mq_detach(decoding_worker->error_mqh);
+		if (status == BGWH_POSTMASTER_DIED)
+			ereport(FATAL,
+					errcode(ERRCODE_ADMIN_SHUTDOWN),
+					errmsg("postmaster exited during REPACK command"));
+	}
 
 	/*
-	 * If we could not cancel the current sleep due to ERROR, do that before
-	 * we detach from the shared memory the condition variable is located in.
-	 * If we did not, the bgworker ERROR handling code would try and fail
-	 * badly.
+	 * Now detach from our shared memory segment.  In error cases there might
+	 * still be messages from the worker in the queue, which ProcessInterrupts
+	 * would try to read; this is pointless (and causes an assertion failure),
+	 * so set the global pointer to NULL to have ProcessRepackMessages ignore
+	 * them.
 	 */
-	ConditionVariableCancelSleep();
-
-	dsm_detach(decoding_worker->seg);
+	dsmseg = decoding_worker->seg;
 	pfree(decoding_worker);
 	decoding_worker = NULL;
+
+	/* We must also cancel the current sleep, if one is still set up */
+	ConditionVariableCancelSleep();
+
+	if (dsmseg != NULL)
+		dsm_detach(dsmseg);
 }
 
 /* stop_repack_decoding_worker, wrapped as a before_shmem_exit callback */
-- 
2.47.3


--b42ct6adeyjj4cbm--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread

* [PATCH v1 1/1] clean up AdjustUpgrade.pm after pg_upgrade min version bump
@ 2026-07-08 21:39 Nathan Bossart <[email protected]>
  0 siblings, 0 replies; 165+ messages in thread

From: Nathan Bossart @ 2026-07-08 21:39 UTC (permalink / raw)

---
 .../perl/PostgreSQL/Test/AdjustUpgrade.pm     | 207 +-----------------
 1 file changed, 5 insertions(+), 202 deletions(-)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 878fcc16a9e..04844298ab3 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -199,15 +199,10 @@ sub adjust_database_contents
 			'drop operator if exists #@%# (bigint,NONE)');
 
 		# get rid of dblink's dependencies on regress.so
-		my $regrdb =
-		  $old_version le '9.4'
-		  ? 'contrib_regression'
-		  : 'contrib_regression_dblink';
-
-		if ($dbnames{$regrdb})
+		if ($dbnames{'contrib_regression_dblink'})
 		{
 			_add_st(
-				$result, $regrdb,
+				$result, 'contrib_regression_dblink',
 				'drop function if exists public.putenv(text)',
 				'drop function if exists public.wait_pid(integer)');
 		}
@@ -250,7 +245,7 @@ sub adjust_database_contents
 		}
 
 		# this table had OIDs too, but we'll just drop it
-		if ($old_version >= 10 && $dbnames{'contrib_regression_postgres_fdw'})
+		if ($dbnames{'contrib_regression_postgres_fdw'})
 		{
 			_add_st(
 				$result,
@@ -276,43 +271,13 @@ sub adjust_database_contents
 			'drop function if exists public.funny_dup17()');
 	}
 
-	# version-0 C functions are no longer supported
-	if ($old_version < 10)
-	{
-		_add_st($result, 'regression',
-			'drop function oldstyle_length(integer, text)');
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# cope with changes of underlying functions
-		_add_st(
-			$result,
-			'regression',
-			'drop operator @#@ (NONE, bigint)',
-			'CREATE OPERATOR @#@ ('
-			  . 'PROCEDURE = factorial, RIGHTARG = bigint )',
-			'drop aggregate public.array_cat_accum(anyarray)',
-			'CREATE AGGREGATE array_larger_accum (anyarray) ' . ' ( '
-			  . '   sfunc = array_larger, '
-			  . '   stype = anyarray, '
-			  . '   initcond = $${}$$ ' . '  ) ');
-
-		# "=>" is no longer valid as an operator name
-		_add_st($result, 'regression',
-			'drop operator if exists public.=> (bigint, NONE)');
-	}
-
 	# Version 19 changed the output format of pg_lsn.  To avoid output
 	# differences, set all pg_lsn columns to NULL if the old version is
 	# older than 19.
 	if ($old_version < 19)
 	{
-		if ($old_version >= '9.5')
-		{
-			_add_st($result, 'regression',
-				"update brintest set lsncol = NULL");
-		}
+		_add_st($result, 'regression',
+			"update brintest set lsncol = NULL");
 
 		if ($old_version >= 12)
 		{
@@ -426,107 +391,6 @@ sub adjust_old_dumpfile
 			/$1 EXECUTE FUNCTION/mgx;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	if ($old_version lt '9.6')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix =
-		  "'New York'\tnew & york | big & apple | nyc\t'new' & 'york'\t";
-		my $orig = "( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'";
-		my $repl = "'new' & 'york' | 'big' & 'appl' | 'nyc'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-
-		$prefix =
-		  "'Sanct Peter'\tPeterburg | peter | 'Sanct Peterburg'\t'sanct' & 'peter'\t";
-		$orig = "( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'";
-		$repl = "'peterburg' | 'peter' | 'sanct' & 'peterburg'";
-		$dump =~ s/(?<=^\Q$prefix\E)\Q$orig\E/$repl/mg;
-	}
-
-	if ($old_version lt '9.5')
-	{
-		# adjust some places where we don't print so many parens anymore
-
-		my $prefix = "CONSTRAINT (?:sequence|copy)_con CHECK [(][(]";
-		my $orig = "((x > 3) AND (y <> 'check failed'::text))";
-		my $repl = "(x > 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$prefix = "CONSTRAINT insert_con CHECK [(][(]";
-		$orig = "((x >= 3) AND (y <> 'check failed'::text))";
-		$repl = "(x >= 3) AND (y <> 'check failed'::text)";
-		$dump =~ s/($prefix)\Q$orig\E/$1$repl/mg;
-
-		$orig = "DEFAULT ((-1) * currval('public.insert_seq'::regclass))";
-		$repl =
-		  "DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass))";
-		$dump =~ s/\Q$orig\E/$repl/mg;
-
-		my $expr =
-		  "(rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-
-		$expr =
-		  "(rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)";
-		$dump =~ s/WHERE \(\(\Q$expr\E\)/WHERE ($expr/g;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-
-		# _mash_view_whitespace doesn't handle multi-command rules;
-		# rather than trying to fix that, just hack the exceptions manually.
-
-		my $prefix =
-		  "CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname);";
-		my $line2 = " DELETE FROM public.rtest_admin";
-		my $line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		$prefix =
-		  "CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname);";
-		$line2 = " UPDATE public.rtest_admin SET sysname = new.sysname";
-		$line3 = " WHERE (rtest_admin.sysname = old.sysname);";
-		$dump =~
-		  s/(?<=\Q$prefix\E)\Q$line2$line3\E \);/\n$line2\n $line3\n);/mg;
-
-		# and there's one place where pre-9.3 uses a different table alias
-		$dump =~ s {^(CREATE\sRULE\srule_and_refint_t3_ins\sAS\s
-			 ON\sINSERT\sTO\spublic\.rule_and_refint_t3\s
-			 WHERE\s\(EXISTS\s\(SELECT\s1\sFROM\spublic\.rule_and_refint_t3)\s
-			 (WHERE\s\(\(rule_and_refint_t3)
-			 (\.id3a\s=\snew\.id3a\)\sAND\s\(rule_and_refint_t3)
-			 (\.id3b\s=\snew\.id3b\)\sAND\s\(rule_and_refint_t3)}
-		{$1 rule_and_refint_t3_1 $2_1$3_1$4_1}mx;
-
-		# Also fix old use of NATURAL JOIN syntax
-		$dump =~ s {NATURAL JOIN public\.credit_card r}
-			{JOIN public.credit_card r USING (cid)}mg;
-		$dump =~ s {NATURAL JOIN public\.credit_usage r}
-			{JOIN public.credit_usage r USING (cid)}mg;
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
@@ -661,37 +525,6 @@ sub _mash_view_qualifiers
 	return $dump;
 }
 
-
-# Internal subroutine to mangle whitespace within view/rule commands.
-# Any consecutive sequence of whitespace is reduced to one space.
-sub _mash_view_whitespace
-{
-	my ($dump) = @_;
-
-	foreach my $leader ('CREATE VIEW', 'CREATE RULE')
-	{
-		my @splitchunks = split $leader, $dump;
-
-		$dump = shift(@splitchunks);
-		foreach my $chunk (@splitchunks)
-		{
-			my @thischunks = split /;/, $chunk, 2;
-			my $stmt = shift(@thischunks);
-
-			# now $stmt is just the body of the CREATE VIEW/RULE
-			$stmt =~ s/\s+/ /sg;
-			# we also need to smash these forms for sub-selects and rules
-			$stmt =~ s/\( SELECT/(SELECT/g;
-			$stmt =~ s/\( INSERT/(INSERT/g;
-			$stmt =~ s/\( UPDATE/(UPDATE/g;
-			$stmt =~ s/\( DELETE/(DELETE/g;
-
-			$dump .= $leader . $stmt . ';' . $thischunks[0];
-		}
-	}
-	return $dump;
-}
-
 =pod
 
 =item adjust_new_dumpfile($old_version, $dump)
@@ -779,36 +612,6 @@ sub adjust_new_dumpfile
 		$dump =~ s/^SET default_table_access_method = heap;\n//mg;
 	}
 
-	# During pg_upgrade, we reindex hash indexes if the source is pre-v10.
-	# This may change their tables' relallvisible values, so don't compare
-	# those.
-	if ($old_version < 10)
-	{
-		$dump =~ s/
-			(^SELECT\s\*\sFROM\spg_catalog\.pg_restore_relation_stats\(
-			[^;]*'relation',\s'public\.hash_[a-z0-9]*_heap'::regclass,
-			[^;]*'relallvisible',)\s'\d+'::integer
-			/$1 ''::integer/mgx;
-	}
-
-	# dumps from pre-9.6 dblink may include redundant ACL settings
-	if ($old_version lt '9.6')
-	{
-		my $comment =
-		  "-- Name: FUNCTION dblink_connect_u\(.*?\); Type: ACL; Schema: public; Owner: .*";
-		my $sql =
-		  "REVOKE ALL ON FUNCTION public\.dblink_connect_u\(.*?\) FROM PUBLIC;";
-		$dump =~ s/^--\n$comment\n--\n+$sql\n+//mg;
-	}
-
-	if ($old_version lt '9.3')
-	{
-		# CREATE VIEW/RULE statements were not pretty-printed before 9.3.
-		# To cope, reduce all whitespace sequences within them to one space.
-		# This must be done on both old and new dumps.
-		$dump = _mash_view_whitespace($dump);
-	}
-
 	# Suppress blank lines, as some places in pg_dump emit more or fewer.
 	$dump =~ s/\n\n+/\n/g;
 
-- 
2.50.1 (Apple Git-155)


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 165+ messages in thread