From: Tom Lane <tgl@sss.pgh.pa.us>
To: Heikki Linnakangas <hlinnaka@iki.fi>
cc: Michael Paquier <michael@paquier.xyz>,
        Andrew Dunstan <andrew@dunslane.net>,
        pgsql-committers@lists.postgresql.org,
        Sami Imseih <samimseih@gmail.com>
Subject: Re: pgsql: injection_points: Remove portions related to custom
 pgstats
In-reply-to: <d92f0eca-bb14-4b8c-9fb0-3b79635e1a64@iki.fi>
References: <E1vSSCn-003N0Z-2i@gemulon.postgresql.org>
 <2899652.1765167313@sss.pgh.pa.us> <aTZZzFhQTtUKWGLm@paquier.xyz>
 <2904427.1765169854@sss.pgh.pa.us> <aTaPKpYufxut5Zs1@paquier.xyz>
 <d92f0eca-bb14-4b8c-9fb0-3b79635e1a64@iki.fi>
Comments: In-reply-to Heikki Linnakangas <hlinnaka@iki.fi>
	message dated "Tue, 09 Dec 2025 15:24:39 +0200"
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <251241.1765302019.1@sss.pgh.pa.us>
Date: Tue, 09 Dec 2025 12:40:19 -0500
Message-ID: <251242.1765302019@sss.pgh.pa.us>
Archived-At: 
 <https://www.postgresql.org/message-id/251242.1765302019%40sss.pgh.pa.us>
Precedence: bulk

Heikki Linnakangas <hlinnaka@iki.fi> writes:
> Hmm, using the first value of REGRESS is surprising. How about we change 
> the autoconf logic to match what meson does? As attached.

Unless you want to back-patch that as far as 9.2, it's going to make
matters worse not better for predictability of the DB names in the
cross-version upgrade tests.  I think it might be better to make the
meson logic match the makefiles.

Having said that, I think what we should be doing is adding whichever
DB names we decide are problematic to the existing logic at about line
89 in AdjustUpgrade.pm:

	# remove dbs of modules known to cause pg_upgrade to fail
	# anything not builtin and incompatible should clean up its own db
	foreach my $bad_module ('adminpack', 'test_ddl_deparse', 'tsearch2')
	{
		if ($dbnames{"contrib_regression_$bad_module"})
		{
			_add_st($result, 'postgres',
				"drop database contrib_regression_$bad_module");
			delete($dbnames{"contrib_regression_$bad_module"});
		}
		if ($dbnames{"regression_$bad_module"})
		{
			_add_st($result, 'postgres',
				"drop database regression_$bad_module");
			delete($dbnames{"regression_$bad_module"});
		}
	}

Perhaps another alternative is to add "DROP EXTENSION
injection_points" at the end of the test scripts in the
problematic modules.

			regards, tom lane