This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, master has been updated
via c4a86675c184162314980fe99a0145374a290df5 (commit)
via e4296995284f2a1637685621b3b689bef01fd7f8 (commit)
from 57b24bd4050d2dfbccc4992fc22ca54f6be41414 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c4a86675c184162314980fe99a0145374a290df5
Merge: 57b24bd405 e429699528
Author: Darafei Praliaskouski <komzpa at gmail.com>
Date: Sun Aug 9 12:17:21 2026 -0700
Merge pull request 'regress: keep upgrade assertions with their cleanup hook' (!689) from Komzpa/postgis:fix/regress-upgrade-hook-cleanup-20260810 into master
The hook deduplication in `check-locked-upgrade` is the actual regression fix: core tests already add `hook-after-upgrade.sql` through `RUNTESTFLAGS_INTERNAL`, so the target must not add it a second time.
Keep that guard, but put the SQL-object-resolution assertions back in `hook-after-upgrade.sql`, immediately before the schema and helper cleanup they depend on. The assertion-only hook introduced by the preceding change is removed; it did not add coverage and obscured the lifecycle of the fixtures.
Validation: `git diff --check`; GNU Make dry expansion of `check-locked-upgrade` with the core flags contains one after-upgrade hook.
Reviewed-on: https://gitea.osgeo.org/postgis/postgis/pulls/689
commit e4296995284f2a1637685621b3b689bef01fd7f8
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Sun Aug 9 23:11:56 2026 +0400
regress: keep upgrade assertions with their cleanup hook
The assertions need the upgrade fixtures and belong immediately before their cleanup. Keep the check-locked-upgrade hook deduplication from the preceding fix, but remove the assertion-only hook split.
diff --git a/regress/core/tests.mk.in b/regress/core/tests.mk.in
index 18e5d96aa3..1bf0f01bc7 100644
--- a/regress/core/tests.mk.in
+++ b/regress/core/tests.mk.in
@@ -24,7 +24,6 @@ current_dir := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
RUNTESTFLAGS_INTERNAL += \
--after-create-db-script $(top_srcdir)/regress/hooks/hook-after-create-db.sql \
--before-upgrade-script $(top_srcdir)/regress/hooks/hook-before-upgrade.sql \
- --after-upgrade-script $(top_srcdir)/regress/hooks/hook-after-upgrade-sql-object-resolution.sql \
--after-upgrade-script $(top_srcdir)/regress/hooks/hook-after-upgrade.sql \
--after-create-script $(top_srcdir)/regress/hooks/hook-after-create.sql \
--before-uninstall-script $(top_srcdir)/regress/hooks/hook-before-uninstall.sql
diff --git a/regress/hooks/hook-after-upgrade-sql-object-resolution.sql b/regress/hooks/hook-after-upgrade-sql-object-resolution.sql
deleted file mode 100644
index 4685f6ad63..0000000000
--- a/regress/hooks/hook-after-upgrade-sql-object-resolution.sql
+++ /dev/null
@@ -1,28 +0,0 @@
--- These assertions require the fixtures created by hook-before-upgrade.sql.
-DO $$
-BEGIN
- IF EXISTS (SELECT 1 FROM upgrade_test_helper_overload_calls) THEN
- RAISE EXCEPTION 'upgrade helper overload was called';
- END IF;
-END;
-$$;
-
-DROP FUNCTION _postgis_drop_function_by_identity(text, text);
-DROP FUNCTION _postgis_drop_function_by_signature(text);
-DROP TABLE upgrade_test_helper_overload_calls;
-
-DO LANGUAGE plpgsql $postgis_upgrade_test$
-BEGIN
- IF EXISTS (
- SELECT 1
- FROM postgis_upgrade_test_data.issue004_named_argument_operator_calls
- )
- THEN
- RAISE EXCEPTION
- 'generated named-argument guard used the test text-array operator';
- END IF;
-
- -- The replacement must leave the supported function available.
- PERFORM ST_TileEnvelope(0, 0, 0);
-END
-$postgis_upgrade_test$;
diff --git a/regress/hooks/hook-after-upgrade.sql b/regress/hooks/hook-after-upgrade.sql
index 64ce9d770c..c4a9758876 100644
--- a/regress/hooks/hook-after-upgrade.sql
+++ b/regress/hooks/hook-after-upgrade.sql
@@ -10,6 +10,35 @@ DROP VIEW IF EXISTS upgrade_view_test_clusterkmeans;
DROP VIEW IF EXISTS upgrade_view_test_distance;
DROP TABLE IF EXISTS upgrade_test;
+-- These assertions require the fixtures created by hook-before-upgrade.sql.
+DO $$
+BEGIN
+ IF EXISTS (SELECT 1 FROM upgrade_test_helper_overload_calls) THEN
+ RAISE EXCEPTION 'upgrade helper overload was called';
+ END IF;
+END;
+$$;
+
+DROP FUNCTION _postgis_drop_function_by_identity(text, text);
+DROP FUNCTION _postgis_drop_function_by_signature(text);
+DROP TABLE upgrade_test_helper_overload_calls;
+
+DO LANGUAGE plpgsql $postgis_upgrade_test$
+BEGIN
+ IF EXISTS (
+ SELECT 1
+ FROM postgis_upgrade_test_data.issue004_named_argument_operator_calls
+ )
+ THEN
+ RAISE EXCEPTION
+ 'generated named-argument guard used the test text-array operator';
+ END IF;
+
+ -- The replacement must leave the supported function available.
+ PERFORM ST_TileEnvelope(0, 0, 0);
+END
+$postgis_upgrade_test$;
+
-- Drop any upgrade test data
DROP SCHEMA IF EXISTS postgis_upgrade_test_data CASCADE;
-----------------------------------------------------------------------
Summary of changes:
regress/core/tests.mk.in | 1 -
.../hook-after-upgrade-sql-object-resolution.sql | 28 ---------------------
regress/hooks/hook-after-upgrade.sql | 29 ++++++++++++++++++++++
3 files changed, 29 insertions(+), 29 deletions(-)
delete mode 100644 regress/hooks/hook-after-upgrade-sql-object-resolution.sql
hooks/post-receive
--
PostGIS