agora inbox for [email protected]  

help / color / mirror / Atom feed

[PATCH v13 1/2] Key PGSTAT_KIND_RELATION by relfile locator
186+ messages / 2 participants
[nested] [flat]

* [PATCH v13 1/2] Key PGSTAT_KIND_RELATION by relfile locator
@ 2025-10-01 09:45  Bertrand Drouvot <[email protected]>
  0 siblings, 0 replies; 186+ messages in thread

From: Bertrand Drouvot @ 2025-10-01 09:45 UTC (permalink / raw)

This patch changes the key used for the PGSTAT_KIND_RELATION statistic kind.
Instead of the relation oid, it now relies on:

- dboid (linked to RelFileLocator's dbOid)
- objoid which is the result of a new macro (namely RelFileLocatorToPgStatObjid())
that computes an objoid based on the RelFileLocator's spcOid and the
RelFileLocator's relNumber.

This is possible as, since b14e9ce7d55c, the objoid is now uint64 and spcOid
and relNumber are 32 bits.

That will allow us to add new stats (add writes counters) and ensure that some
counters (n_dead_tup and friends) are replicated.

The patch introduces pgstat_reloid_to_relfilelocator() to 1) avoid calling
RelationIdGetRelation() to get the relfilelocator based on the relation oid
and 2) handle the partitioned table case.

Please note that:

- when running pg_stat_have_stats('relation',...) we now need to be connected
to the database that hosts the relation. As pg_stat_have_stats() is not
documented publicly, then the changes done in 029_stats_restart.pl look
enough.

- this patch does not handle rewrites so some tests are failing. It's only
intent is to ease the review and should not be pushed without being
merged with the following patch that handles the rewrites.

- it can be used to test that stats are incremented correctly and that we're
able to retrieve them as long as rewrites are not involved.
---
 src/backend/postmaster/autovacuum.c          |  17 +-
 src/backend/utils/activity/pgstat_relation.c | 236 ++++++++++++++++---
 src/backend/utils/adt/pgstatfuncs.c          |  21 +-
 src/include/catalog/pg_tablespace.dat        |   4 +
 src/include/catalog/pg_tablespace.h          |   8 +
 src/include/pgstat.h                         |  15 +-
 src/include/utils/pgstat_internal.h          |   1 +
 src/test/recovery/t/029_stats_restart.pl     |  40 ++--
 8 files changed, 271 insertions(+), 71 deletions(-)
   6.1% src/backend/postmaster/
  61.7% src/backend/utils/activity/
   4.9% src/backend/utils/adt/
   3.2% src/include/catalog/
   5.6% src/include/
  18.1% src/test/recovery/t/

diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index 219673db930..4bef7ab7543 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -1992,12 +1992,16 @@ do_autovacuum(void)
 		bool		dovacuum;
 		bool		doanalyze;
 		bool		wraparound;
+		RelFileLocator locator;
 
 		if (classForm->relkind != RELKIND_RELATION &&
 			classForm->relkind != RELKIND_MATVIEW)
 			continue;
 
 		relid = classForm->oid;
+		locator.dbOid = classForm->relisshared ? InvalidOid : MyDatabaseId;
+		locator.spcOid = classForm->reltablespace;
+		locator.relNumber = classForm->relfilenode;
 
 		/*
 		 * Check if it is a temp table (presumably, of some other backend's).
@@ -2026,8 +2030,7 @@ do_autovacuum(void)
 
 		/* Fetch reloptions and the pgstat entry for this table */
 		relopts = extract_autovac_opts(tuple, pg_class_desc);
-		tabentry = pgstat_fetch_stat_tabentry_ext(classForm->relisshared,
-												  relid);
+		tabentry = pgstat_fetch_stat_tabentry_by_locator(locator);
 
 		/* Check if it needs vacuum or analyze */
 		relation_needs_vacanalyze(relid, relopts, classForm, tabentry,
@@ -2092,6 +2095,7 @@ do_autovacuum(void)
 		bool		dovacuum;
 		bool		doanalyze;
 		bool		wraparound;
+		RelFileLocator locator;
 
 		/*
 		 * We cannot safely process other backends' temp tables, so skip 'em.
@@ -2100,6 +2104,9 @@ do_autovacuum(void)
 			continue;
 
 		relid = classForm->oid;
+		locator.dbOid = classForm->relisshared ? InvalidOid : MyDatabaseId;
+		locator.spcOid = classForm->reltablespace;
+		locator.relNumber = classForm->relfilenode;
 
 		/*
 		 * fetch reloptions -- if this toast table does not have them, try the
@@ -2119,8 +2126,7 @@ do_autovacuum(void)
 		}
 
 		/* Fetch the pgstat entry for this table */
-		tabentry = pgstat_fetch_stat_tabentry_ext(classForm->relisshared,
-												  relid);
+		tabentry = pgstat_fetch_stat_tabentry_by_locator(locator);
 
 		relation_needs_vacanalyze(relid, relopts, classForm, tabentry,
 								  effective_multixact_freeze_max_age,
@@ -2917,8 +2923,7 @@ recheck_relation_needs_vacanalyze(Oid relid,
 	PgStat_StatTabEntry *tabentry;
 
 	/* fetch the pgstat table entry */
-	tabentry = pgstat_fetch_stat_tabentry_ext(classForm->relisshared,
-											  relid);
+	tabentry = pgstat_fetch_stat_tabentry_ext(relid);
 
 	relation_needs_vacanalyze(relid, avopts, classForm, tabentry,
 							  effective_multixact_freeze_max_age,
diff --git a/src/backend/utils/activity/pgstat_relation.c b/src/backend/utils/activity/pgstat_relation.c
index bc8c43b96aa..89bf0cbed56 100644
--- a/src/backend/utils/activity/pgstat_relation.c
+++ b/src/backend/utils/activity/pgstat_relation.c
@@ -17,12 +17,17 @@
 
 #include "postgres.h"
 
+#include "access/htup_details.h"
 #include "access/twophase_rmgr.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"
+#include "catalog/pg_tablespace.h"
+#include "storage/lmgr.h"
 #include "utils/memutils.h"
 #include "utils/pgstat_internal.h"
 #include "utils/rel.h"
+#include "utils/relmapper.h"
+#include "utils/syscache.h"
 #include "utils/timestamp.h"
 
 
@@ -36,13 +41,12 @@ typedef struct TwoPhasePgStatRecord
 	PgStat_Counter inserted_pre_truncdrop;
 	PgStat_Counter updated_pre_truncdrop;
 	PgStat_Counter deleted_pre_truncdrop;
-	Oid			id;				/* table's OID */
-	bool		shared;			/* is it a shared catalog? */
+	RelFileLocator locator;		/* table's rd_locator */
 	bool		truncdropped;	/* was the relation truncated/dropped? */
 } TwoPhasePgStatRecord;
 
 
-static PgStat_TableStatus *pgstat_prep_relation_pending(Oid rel_id, bool isshared);
+static PgStat_TableStatus *pgstat_prep_relation_pending(RelFileLocator locator);
 static void add_tabstat_xact_level(PgStat_TableStatus *pgstat_info, int nest_level);
 static void ensure_tabstat_xact_level(PgStat_TableStatus *pgstat_info);
 static void save_truncdrop_counters(PgStat_TableXactStatus *trans, bool is_drop);
@@ -60,8 +64,7 @@ pgstat_copy_relation_stats(Relation dst, Relation src)
 	PgStatShared_Relation *dstshstats;
 	PgStat_EntryRef *dst_ref;
 
-	srcstats = pgstat_fetch_stat_tabentry_ext(src->rd_rel->relisshared,
-											  RelationGetRelid(src));
+	srcstats = pgstat_fetch_stat_tabentry_ext(RelationGetRelid(src));
 	if (!srcstats)
 		return;
 
@@ -94,8 +97,10 @@ pgstat_init_relation(Relation rel)
 
 	/*
 	 * We only count stats for relations with storage and partitioned tables
+	 * and we don't count stats generated during a rewrite.
 	 */
-	if (!RELKIND_HAS_STORAGE(relkind) && relkind != RELKIND_PARTITIONED_TABLE)
+	if ((!RELKIND_HAS_STORAGE(relkind) && relkind != RELKIND_PARTITIONED_TABLE) ||
+		OidIsValid(rel->rd_rel->relrewrite))
 	{
 		rel->pgstat_enabled = false;
 		rel->pgstat_info = NULL;
@@ -130,12 +135,37 @@ pgstat_init_relation(Relation rel)
 void
 pgstat_assoc_relation(Relation rel)
 {
+	RelFileLocator locator;
+
 	Assert(rel->pgstat_enabled);
 	Assert(rel->pgstat_info == NULL);
 
+	/*
+	 * Don't associate stats for relations without storage and non partitioned
+	 * tables.
+	 */
+	if (!RELKIND_HAS_STORAGE(rel->rd_rel->relkind) &&
+		rel->rd_rel->relkind != RELKIND_PARTITIONED_TABLE)
+		return;
+
+	if (rel->rd_rel->relkind != RELKIND_PARTITIONED_TABLE)
+		locator = rel->rd_locator;
+	else
+	{
+		/*
+		 * Partitioned tables don't have storage, so construct a synthetic
+		 * locator for statistics tracking. Use a reserved pseudo tablespace
+		 * OID that cannot conflict with real tablespaces, and the relation
+		 * OID as relNumber. This ensures no collision with regular relations
+		 * even after OID wraparound.
+		 */
+		locator.dbOid = (rel->rd_rel->relisshared ? InvalidOid : MyDatabaseId);
+		locator.spcOid = PSEUDO_PARTITION_TABLE_SPCOID;
+		locator.relNumber = rel->rd_id;
+	}
+
 	/* Else find or make the PgStat_TableStatus entry, and update link */
-	rel->pgstat_info = pgstat_prep_relation_pending(RelationGetRelid(rel),
-													rel->rd_rel->relisshared);
+	rel->pgstat_info = pgstat_prep_relation_pending(locator);
 
 	/* don't allow link a stats to multiple relcache entries */
 	Assert(rel->pgstat_info->relation == NULL);
@@ -167,9 +197,13 @@ pgstat_unlink_relation(Relation rel)
 void
 pgstat_create_relation(Relation rel)
 {
+	/* don't track stats for relations without storage */
+	if (!RELKIND_HAS_STORAGE(rel->rd_rel->relkind))
+		return;
+
 	pgstat_create_transactional(PGSTAT_KIND_RELATION,
-								rel->rd_rel->relisshared ? InvalidOid : MyDatabaseId,
-								RelationGetRelid(rel));
+								rel->rd_locator.dbOid,
+								RelFileLocatorToPgStatObjid(rel->rd_locator));
 }
 
 /*
@@ -181,9 +215,13 @@ pgstat_drop_relation(Relation rel)
 	int			nest_level = GetCurrentTransactionNestLevel();
 	PgStat_TableStatus *pgstat_info;
 
+	/* don't track stats for relations without storage */
+	if (!RELKIND_HAS_STORAGE(rel->rd_rel->relkind))
+		return;
+
 	pgstat_drop_transactional(PGSTAT_KIND_RELATION,
-							  rel->rd_rel->relisshared ? InvalidOid : MyDatabaseId,
-							  RelationGetRelid(rel));
+							  rel->rd_locator.dbOid,
+							  RelFileLocatorToPgStatObjid(rel->rd_locator));
 
 	if (!pgstat_should_count_relation(rel))
 		return;
@@ -213,20 +251,23 @@ pgstat_report_vacuum(Relation rel, PgStat_Counter livetuples,
 	PgStat_EntryRef *entry_ref;
 	PgStatShared_Relation *shtabentry;
 	PgStat_StatTabEntry *tabentry;
-	Oid			dboid = (rel->rd_rel->relisshared ? InvalidOid : MyDatabaseId);
 	TimestampTz ts;
 	PgStat_Counter elapsedtime;
+	RelFileLocator locator;
 
 	if (!pgstat_track_counts)
 		return;
 
+	locator = rel->rd_locator;
+
 	/* Store the data in the table's hash table entry. */
 	ts = GetCurrentTimestamp();
 	elapsedtime = TimestampDifferenceMilliseconds(starttime, ts);
 
 	/* block acquiring lock for the same reason as pgstat_report_autovac() */
-	entry_ref = pgstat_get_entry_ref_locked(PGSTAT_KIND_RELATION, dboid,
-											RelationGetRelid(rel), false);
+	entry_ref = pgstat_get_entry_ref_locked(PGSTAT_KIND_RELATION, locator.dbOid,
+											RelFileLocatorToPgStatObjid(locator),
+											false);
 
 	shtabentry = (PgStatShared_Relation *) entry_ref->shared_stats;
 	tabentry = &shtabentry->stats;
@@ -285,9 +326,9 @@ pgstat_report_analyze(Relation rel,
 	PgStat_EntryRef *entry_ref;
 	PgStatShared_Relation *shtabentry;
 	PgStat_StatTabEntry *tabentry;
-	Oid			dboid = (rel->rd_rel->relisshared ? InvalidOid : MyDatabaseId);
 	TimestampTz ts;
 	PgStat_Counter elapsedtime;
+	RelFileLocator locator;
 
 	if (!pgstat_track_counts)
 		return;
@@ -325,9 +366,25 @@ pgstat_report_analyze(Relation rel,
 	ts = GetCurrentTimestamp();
 	elapsedtime = TimestampDifferenceMilliseconds(starttime, ts);
 
+	if (rel->rd_rel->relkind != RELKIND_PARTITIONED_TABLE)
+		locator = rel->rd_locator;
+	else
+	{
+		/*
+		 * Partitioned tables don't have storage, so construct a synthetic
+		 * locator for statistics tracking. Use a reserved pseudo tablespace
+		 * OID that cannot conflict with real tablespaces, and the relation
+		 * OID as relNumber. This ensures no collision with regular relations
+		 * even after OID wraparound.
+		 */
+		locator.dbOid = (rel->rd_rel->relisshared ? InvalidOid : MyDatabaseId);
+		locator.spcOid = PSEUDO_PARTITION_TABLE_SPCOID;
+		locator.relNumber = rel->rd_id;
+	}
 	/* block acquiring lock for the same reason as pgstat_report_autovac() */
-	entry_ref = pgstat_get_entry_ref_locked(PGSTAT_KIND_RELATION, dboid,
-											RelationGetRelid(rel),
+	entry_ref = pgstat_get_entry_ref_locked(PGSTAT_KIND_RELATION,
+											locator.dbOid,
+											RelFileLocatorToPgStatObjid(locator),
 											false);
 	/* can't get dropped while accessed */
 	Assert(entry_ref != NULL && entry_ref->shared_stats != NULL);
@@ -468,7 +525,16 @@ pgstat_update_heap_dead_tuples(Relation rel, int delta)
 PgStat_StatTabEntry *
 pgstat_fetch_stat_tabentry(Oid relid)
 {
-	return pgstat_fetch_stat_tabentry_ext(IsSharedRelation(relid), relid);
+	return pgstat_fetch_stat_tabentry_ext(relid);
+}
+
+PgStat_StatTabEntry *
+pgstat_fetch_stat_tabentry_by_locator(RelFileLocator locator)
+{
+	return (PgStat_StatTabEntry *) pgstat_fetch_entry(
+													  PGSTAT_KIND_RELATION,
+													  locator.dbOid,
+													  RelFileLocatorToPgStatObjid(locator));
 }
 
 /*
@@ -476,12 +542,14 @@ pgstat_fetch_stat_tabentry(Oid relid)
  * whether the to-be-accessed table is a shared relation or not.
  */
 PgStat_StatTabEntry *
-pgstat_fetch_stat_tabentry_ext(bool shared, Oid reloid)
+pgstat_fetch_stat_tabentry_ext(Oid reloid)
 {
-	Oid			dboid = (shared ? InvalidOid : MyDatabaseId);
+	RelFileLocator locator;
 
-	return (PgStat_StatTabEntry *)
-		pgstat_fetch_entry(PGSTAT_KIND_RELATION, dboid, reloid);
+	if (!pgstat_reloid_to_relfilelocator(reloid, &locator))
+		return NULL;
+
+	return pgstat_fetch_stat_tabentry_by_locator(locator);
 }
 
 /*
@@ -503,14 +571,17 @@ find_tabstat_entry(Oid rel_id)
 	PgStat_TableXactStatus *trans;
 	PgStat_TableStatus *tabentry = NULL;
 	PgStat_TableStatus *tablestatus = NULL;
+	RelFileLocator locator;
+
+	if (!pgstat_reloid_to_relfilelocator(rel_id, &locator))
+		return NULL;
+
+	entry_ref = pgstat_fetch_pending_entry(PGSTAT_KIND_RELATION,
+										   locator.dbOid,
+										   RelFileLocatorToPgStatObjid(locator));
 
-	entry_ref = pgstat_fetch_pending_entry(PGSTAT_KIND_RELATION, MyDatabaseId, rel_id);
 	if (!entry_ref)
-	{
-		entry_ref = pgstat_fetch_pending_entry(PGSTAT_KIND_RELATION, InvalidOid, rel_id);
-		if (!entry_ref)
-			return tablestatus;
-	}
+		return tablestatus;
 
 	tabentry = (PgStat_TableStatus *) entry_ref->pending;
 	tablestatus = palloc_object(PgStat_TableStatus);
@@ -706,8 +777,12 @@ AtPrepare_PgStat_Relations(PgStat_SubXactStatus *xact_state)
 		record.inserted_pre_truncdrop = trans->inserted_pre_truncdrop;
 		record.updated_pre_truncdrop = trans->updated_pre_truncdrop;
 		record.deleted_pre_truncdrop = trans->deleted_pre_truncdrop;
-		record.id = tabstat->id;
-		record.shared = tabstat->shared;
+
+		if (tabstat->relation != NULL)
+			record.locator = tabstat->relation->rd_locator;
+		else
+			record.locator = tabstat->locator;
+
 		record.truncdropped = trans->truncdropped;
 
 		RegisterTwoPhaseRecord(TWOPHASE_RM_PGSTAT_ID, 0,
@@ -750,7 +825,7 @@ pgstat_twophase_postcommit(FullTransactionId fxid, uint16 info,
 	PgStat_TableStatus *pgstat_info;
 
 	/* Find or create a tabstat entry for the rel */
-	pgstat_info = pgstat_prep_relation_pending(rec->id, rec->shared);
+	pgstat_info = pgstat_prep_relation_pending(rec->locator);
 
 	/* Same math as in AtEOXact_PgStat, commit case */
 	pgstat_info->counts.tuples_inserted += rec->tuples_inserted;
@@ -785,8 +860,8 @@ pgstat_twophase_postabort(FullTransactionId fxid, uint16 info,
 	TwoPhasePgStatRecord *rec = (TwoPhasePgStatRecord *) recdata;
 	PgStat_TableStatus *pgstat_info;
 
-	/* Find or create a tabstat entry for the rel */
-	pgstat_info = pgstat_prep_relation_pending(rec->id, rec->shared);
+	/* Find or create a tabstat entry for the target locator */
+	pgstat_info = pgstat_prep_relation_pending(rec->locator);
 
 	/* Same math as in AtEOXact_PgStat, abort case */
 	if (rec->truncdropped)
@@ -920,17 +995,21 @@ pgstat_relation_reset_timestamp_cb(PgStatShared_Common *header, TimestampTz ts)
  * initialized if not exists.
  */
 static PgStat_TableStatus *
-pgstat_prep_relation_pending(Oid rel_id, bool isshared)
+pgstat_prep_relation_pending(RelFileLocator locator)
 {
 	PgStat_EntryRef *entry_ref;
 	PgStat_TableStatus *pending;
+	uint64		objid;
+
+	objid = RelFileLocatorToPgStatObjid(locator);
 
 	entry_ref = pgstat_prep_pending_entry(PGSTAT_KIND_RELATION,
-										  isshared ? InvalidOid : MyDatabaseId,
-										  rel_id, NULL);
+										  locator.dbOid,
+										  objid, NULL);
+
 	pending = entry_ref->pending;
-	pending->id = rel_id;
-	pending->shared = isshared;
+	pending->id = objid;
+	pending->locator = locator;
 
 	return pending;
 }
@@ -1009,3 +1088,82 @@ restore_truncdrop_counters(PgStat_TableXactStatus *trans)
 		trans->tuples_deleted = trans->deleted_pre_truncdrop;
 	}
 }
+
+/*
+ * Convert a relation OID to its corresponding RelFileLocator for statistics
+ * tracking purposes.
+ *
+ * Returns true on success, false if the relation doesn't need statistics
+ * tracking.
+ *
+ * For partitioned tables, constructs a synthetic locator using the relation
+ * OID as relNumber, since they don't have storage.
+ */
+bool
+pgstat_reloid_to_relfilelocator(Oid reloid, RelFileLocator *locator)
+{
+	HeapTuple	tuple;
+	Form_pg_class relform;
+	bool		result = true;
+
+	/* get the relation's tuple from pg_class */
+	tuple = SearchSysCache1(RELOID, ObjectIdGetDatum(reloid));
+
+	if (!HeapTupleIsValid(tuple))
+		return false;
+
+	relform = (Form_pg_class) GETSTRUCT(tuple);
+
+	/* skip relations without storage and non partitioned tables */
+	if (!RELKIND_HAS_STORAGE(relform->relkind) &&
+		relform->relkind != RELKIND_PARTITIONED_TABLE)
+	{
+		ReleaseSysCache(tuple);
+		return false;
+	}
+
+	if (relform->relkind != RELKIND_PARTITIONED_TABLE)
+	{
+		/* build the RelFileLocator */
+		locator->relNumber = relform->relfilenode;
+		locator->spcOid = relform->reltablespace;
+
+		/* handle default tablespace */
+		if (!OidIsValid(locator->spcOid))
+			locator->spcOid = MyDatabaseTableSpace;
+
+		/* handle dbOid for global vs local relations */
+		if (locator->spcOid == GLOBALTABLESPACE_OID)
+			locator->dbOid = InvalidOid;
+		else
+			locator->dbOid = MyDatabaseId;
+
+		/* handle mapped relations */
+		if (!RelFileNumberIsValid(locator->relNumber))
+		{
+			locator->relNumber = RelationMapOidToFilenumber(reloid,
+															relform->relisshared);
+			if (!RelFileNumberIsValid(locator->relNumber))
+			{
+				ReleaseSysCache(tuple);
+				return false;
+			}
+		}
+	}
+	else
+	{
+		/*
+		 * Partitioned tables don't have storage, so construct a synthetic
+		 * locator for statistics tracking. Use a reserved pseudo tablespace
+		 * OID that cannot conflict with real tablespaces, and the relation
+		 * OID as relNumber. This ensures no collision with regular relations
+		 * even after OID wraparound.
+		 */
+		locator->dbOid = (relform->relisshared ? InvalidOid : MyDatabaseId);
+		locator->spcOid = PSEUDO_PARTITION_TABLE_SPCOID;
+		locator->relNumber = relform->oid;
+	}
+
+	ReleaseSysCache(tuple);
+	return result;
+}
diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c
index 5f907335990..106d1e577a7 100644
--- a/src/backend/utils/adt/pgstatfuncs.c
+++ b/src/backend/utils/adt/pgstatfuncs.c
@@ -30,6 +30,7 @@
 #include "storage/procarray.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
+#include "utils/pgstat_internal.h"
 #include "utils/timestamp.h"
 #include "utils/tuplestore.h"
 #include "utils/wait_event.h"
@@ -1965,9 +1966,14 @@ Datum
 pg_stat_reset_single_table_counters(PG_FUNCTION_ARGS)
 {
 	Oid			taboid = PG_GETARG_OID(0);
-	Oid			dboid = (IsSharedRelation(taboid) ? InvalidOid : MyDatabaseId);
+	RelFileLocator locator;
 
-	pgstat_reset(PGSTAT_KIND_RELATION, dboid, taboid);
+	/* Get the stats locator from the relation OID */
+	if (!pgstat_reloid_to_relfilelocator(taboid, &locator))
+		PG_RETURN_VOID();
+
+	pgstat_reset(PGSTAT_KIND_RELATION, locator.dbOid,
+				 RelFileLocatorToPgStatObjid(locator));
 
 	PG_RETURN_VOID();
 }
@@ -2324,5 +2330,16 @@ pg_stat_have_stats(PG_FUNCTION_ARGS)
 	uint64		objid = PG_GETARG_INT64(2);
 	PgStat_Kind kind = pgstat_get_kind_from_str(stats_type);
 
+	/* Convert relation OID to relfilenode objid */
+	if (kind == PGSTAT_KIND_RELATION)
+	{
+		RelFileLocator locator;
+
+		if (!pgstat_reloid_to_relfilelocator(objid, &locator))
+			PG_RETURN_BOOL(false);
+
+		objid = RelFileLocatorToPgStatObjid(locator);
+	}
+
 	PG_RETURN_BOOL(pgstat_have_entry(kind, dboid, objid));
 }
diff --git a/src/include/catalog/pg_tablespace.dat b/src/include/catalog/pg_tablespace.dat
index c4cde415219..73ed046be31 100644
--- a/src/include/catalog/pg_tablespace.dat
+++ b/src/include/catalog/pg_tablespace.dat
@@ -10,6 +10,10 @@
 #
 #----------------------------------------------------------------------
 
+/*
+ * When adding a new one, ensure it does not conflict with
+ * PSEUDO_PARTITION_TABLE_SPCOID.
+ */
 [
 
 { oid => '1663', oid_symbol => 'DEFAULTTABLESPACE_OID',
diff --git a/src/include/catalog/pg_tablespace.h b/src/include/catalog/pg_tablespace.h
index 3bd4a74f003..e5e818eb0c5 100644
--- a/src/include/catalog/pg_tablespace.h
+++ b/src/include/catalog/pg_tablespace.h
@@ -21,6 +21,14 @@
 #include "catalog/genbki.h"
 #include "catalog/pg_tablespace_d.h"	/* IWYU pragma: export */
 
+/*
+ * Reserved tablespace OID for partitioned table pseudo locators.
+ * This is not an actual tablespace, just a reserved value to distinguish
+ * partitioned table statistics from regular table statistics. Ensures it does
+ * not conflict with the ones in pg_tablespace.dat.
+ */
+#define PSEUDO_PARTITION_TABLE_SPCOID 1665
+
 /* ----------------
  *		pg_tablespace definition.  cpp turns this into
  *		typedef struct FormData_pg_tablespace
diff --git a/src/include/pgstat.h b/src/include/pgstat.h
index 216b93492ba..689c624f373 100644
--- a/src/include/pgstat.h
+++ b/src/include/pgstat.h
@@ -15,6 +15,7 @@
 #include "portability/instr_time.h"
 #include "postmaster/pgarch.h"	/* for MAX_XFN_CHARS */
 #include "replication/conflict.h"
+#include "storage/relfilelocator.h"
 #include "utils/backend_progress.h" /* for backward compatibility */	/* IWYU pragma: export */
 #include "utils/backend_status.h"	/* for backward compatibility */	/* IWYU pragma: export */
 #include "utils/pgstat_kind.h"
@@ -38,6 +39,12 @@ typedef struct RelationData *Relation;
 /* Default directory to store temporary statistics data in */
 #define PG_STAT_TMP_DIR		"pg_stat_tmp"
 
+/*
+ * Build a pgstat key Objid based on a RelFileLocator.
+ */
+#define RelFileLocatorToPgStatObjid(locator) \
+	(((uint64) (locator).spcOid << 32) | (locator).relNumber)
+
 /* Values for track_functions GUC variable --- order is significant! */
 typedef enum TrackFunctionsLevel
 {
@@ -178,11 +185,11 @@ typedef struct PgStat_TableCounts
  */
 typedef struct PgStat_TableStatus
 {
-	Oid			id;				/* table's OID */
-	bool		shared;			/* is it a shared catalog? */
+	uint64		id;				/* hash of relfilelocator for stats key */
 	struct PgStat_TableXactStatus *trans;	/* lowest subxact's counts */
 	PgStat_TableCounts counts;	/* event counts to be sent */
 	Relation	relation;		/* rel that is using this entry */
+	RelFileLocator locator;		/* table's relfilelocator */
 } PgStat_TableStatus;
 
 /* ----------
@@ -738,8 +745,8 @@ extern void pgstat_twophase_postabort(FullTransactionId fxid, uint16 info,
 									  void *recdata, uint32 len);
 
 extern PgStat_StatTabEntry *pgstat_fetch_stat_tabentry(Oid relid);
-extern PgStat_StatTabEntry *pgstat_fetch_stat_tabentry_ext(bool shared,
-														   Oid reloid);
+extern PgStat_StatTabEntry *pgstat_fetch_stat_tabentry_by_locator(RelFileLocator locator);
+extern PgStat_StatTabEntry *pgstat_fetch_stat_tabentry_ext(Oid reloid);
 extern PgStat_TableStatus *find_tabstat_entry(Oid rel_id);
 
 
diff --git a/src/include/utils/pgstat_internal.h b/src/include/utils/pgstat_internal.h
index 9b8fbae00ed..42f29496551 100644
--- a/src/include/utils/pgstat_internal.h
+++ b/src/include/utils/pgstat_internal.h
@@ -765,6 +765,7 @@ extern void PostPrepare_PgStat_Relations(PgStat_SubXactStatus *xact_state);
 extern bool pgstat_relation_flush_cb(PgStat_EntryRef *entry_ref, bool nowait);
 extern void pgstat_relation_delete_pending_cb(PgStat_EntryRef *entry_ref);
 extern void pgstat_relation_reset_timestamp_cb(PgStatShared_Common *header, TimestampTz ts);
+extern bool pgstat_reloid_to_relfilelocator(Oid reloid, RelFileLocator *locator);
 
 
 /*
diff --git a/src/test/recovery/t/029_stats_restart.pl b/src/test/recovery/t/029_stats_restart.pl
index cdc427dbc78..4d00087dc6f 100644
--- a/src/test/recovery/t/029_stats_restart.pl
+++ b/src/test/recovery/t/029_stats_restart.pl
@@ -55,10 +55,10 @@ trigger_funcrel_stat();
 
 # verify stats objects exist
 $sect = "initial";
-is(have_stats('database', $dboid, 0), 't', "$sect: db stats do exist");
-is(have_stats('function', $dboid, $funcoid),
+is(have_stats($connect_db, 'database', $dboid, 0), 't', "$sect: db stats do exist");
+is(have_stats($db_under_test, 'function', $dboid, $funcoid),
 	't', "$sect: function stats do exist");
-is(have_stats('relation', $dboid, $tableoid),
+is(have_stats($db_under_test, 'relation', $dboid, $tableoid),
 	't', "$sect: relation stats do exist");
 
 # regular shutdown
@@ -79,10 +79,10 @@ copy($og_stats, $statsfile) or die "Copy failed: $!";
 $node->start;
 
 $sect = "copy";
-is(have_stats('database', $dboid, 0), 't', "$sect: db stats do exist");
-is(have_stats('function', $dboid, $funcoid),
+is(have_stats($connect_db, 'database', $dboid, 0), 't', "$sect: db stats do exist");
+is(have_stats($db_under_test, 'function', $dboid, $funcoid),
 	't', "$sect: function stats do exist");
-is(have_stats('relation', $dboid, $tableoid),
+is(have_stats($db_under_test, 'relation', $dboid, $tableoid),
 	't', "$sect: relation stats do exist");
 
 $node->stop('immediate');
@@ -96,10 +96,10 @@ $node->start;
 
 # stats should have been discarded
 $sect = "post immediate";
-is(have_stats('database', $dboid, 0), 'f', "$sect: db stats do not exist");
-is(have_stats('function', $dboid, $funcoid),
+is(have_stats($connect_db, 'database', $dboid, 0), 'f', "$sect: db stats do not exist");
+is(have_stats($db_under_test, 'function', $dboid, $funcoid),
 	'f', "$sect: function stats do exist");
-is(have_stats('relation', $dboid, $tableoid),
+is(have_stats($db_under_test, 'relation', $dboid, $tableoid),
 	'f', "$sect: relation stats do not exist");
 
 # get rid of backup statsfile
@@ -110,10 +110,10 @@ unlink $statsfile or die "cannot unlink $statsfile $!";
 trigger_funcrel_stat();
 
 $sect = "post immediate, new";
-is(have_stats('database', $dboid, 0), 't', "$sect: db stats do exist");
-is(have_stats('function', $dboid, $funcoid),
+is(have_stats($connect_db, 'database', $dboid, 0), 't', "$sect: db stats do exist");
+is(have_stats($db_under_test, 'function', $dboid, $funcoid),
 	't', "$sect: function stats do exist");
-is(have_stats('relation', $dboid, $tableoid),
+is(have_stats($db_under_test, 'relation', $dboid, $tableoid),
 	't', "$sect: relation stats do exist");
 
 # regular shutdown
@@ -129,10 +129,10 @@ $node->start;
 
 # no stats present due to invalid stats file
 $sect = "invalid_overwrite";
-is(have_stats('database', $dboid, 0), 'f', "$sect: db stats do not exist");
-is(have_stats('function', $dboid, $funcoid),
+is(have_stats($connect_db, 'database', $dboid, 0), 'f', "$sect: db stats do not exist");
+is(have_stats($db_under_test, 'function', $dboid, $funcoid),
 	'f', "$sect: function stats do not exist");
-is(have_stats('relation', $dboid, $tableoid),
+is(have_stats($db_under_test, 'relation', $dboid, $tableoid),
 	'f', "$sect: relation stats do not exist");
 
 
@@ -145,10 +145,10 @@ append_file($og_stats, "XYZ");
 $node->start;
 
 $sect = "invalid_append";
-is(have_stats('database', $dboid, 0), 'f', "$sect: db stats do not exist");
-is(have_stats('function', $dboid, $funcoid),
+is(have_stats($connect_db, 'database', $dboid, 0), 'f', "$sect: db stats do not exist");
+is(have_stats($db_under_test, 'function', $dboid, $funcoid),
 	'f', "$sect: function stats do not exist");
-is(have_stats('relation', $dboid, $tableoid),
+is(have_stats($db_under_test, 'relation', $dboid, $tableoid),
 	'f', "$sect: relation stats do not exist");
 
 
@@ -307,9 +307,9 @@ sub trigger_funcrel_stat
 
 sub have_stats
 {
-	my ($kind, $dboid, $objid) = @_;
+	my ($db, $kind, $dboid, $objid) = @_;
 
-	return $node->safe_psql($connect_db,
+	return $node->safe_psql($db,
 		"SELECT pg_stat_have_stats('$kind', $dboid, $objid)");
 }
 
-- 
2.34.1


--USlF2Vr25us5UpvY
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment;
	filename="v13-0002-handle-relation-statistics-correctly-during-rewr.patch"



^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






^ permalink  raw  reply  [nested|flat] 186+ 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; 186+ messages in thread

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

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

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


--WhtY6+QncUkBAPlR--






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