From b46344c697771e5496e5d837b9e8e6e2d6b88b01 Mon Sep 17 00:00:00 2001
From: Michael Paquier <michael@paquier.xyz>
Date: Mon, 8 Dec 2025 13:51:40 +0900
Subject: [PATCH] Adjust upgrade outputs

---
 src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
index 7224c286e1df..78d060c989ab 100644
--- a/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
+++ b/src/test/perl/PostgreSQL/Test/AdjustUpgrade.pm
@@ -102,6 +102,19 @@ sub adjust_database_contents
 		}
 	}
 
+	# Remove databases that are known to cause upgrades to fail because of
+	# updates done in the test module injection_points in v19 that these rely
+	# on.
+	if ($old_version >= 18)
+	{
+		_add_st($result, 'postgres', 'drop database regression_typcache');
+	}
+
+	if ($old_version >= 17)
+	{
+		_add_st($result, 'postgres', 'drop database regression_gin');
+	}
+
 	# avoid no-path-to-downgrade-extension-version issues
 	if ($dbnames{contrib_regression_test_extensions})
 	{
-- 
2.51.0

