[SCM] PostGIS branch master updated. 3.7.0beta1-278-g57b24bd405

[git at osgeo.org]

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  57b24bd4050d2dfbccc4992fc22ca54f6be41414 (commit)
       via  3bb4f15c4982ad04a5c710ccec0fc66ba2126ccc (commit)
      from  57916f4714c4afd722a0222711a291db7a6b409f (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 57b24bd4050d2dfbccc4992fc22ca54f6be41414
Merge: 57916f4714 3bb4f15c49
Author: Darafei Praliaskouski <komzpa at gmail.com>
Date:   Sun Aug 9 10:20:44 2026 -0700

    Merge pull request 'regress: pair SQL object resolution upgrade hooks' (!679) from Komzpa/postgis:fix/upgrade-hooks-ci-20260809 into master
    
    The SQL object resolution assertions require fixtures from hook-before-upgrade.sql. The core regression flags already run that before hook and then the matching assertion hook before generic cleanup.
    
    check-locked-upgrade prepends use-all-functions.sql, but it also inherits the core internal flags. Previously it therefore prepended a duplicate generic after-upgrade cleanup: that first cleanup dropped the fixture schema before the matching assertions ran. Add the generic cleanup there only when the internal flags do not already provide it.
    
    This keeps the locked-upgrade setup additive, runs the paired SQL object resolution assertions before cleanup, and preserves generic cleanup for callers without core internal flags. The make expansion has been checked for both cases; final coverage is Woodpecker pipeline 6753 on this head.
    
    Reviewed-on: https://gitea.osgeo.org/postgis/postgis/pulls/679


commit 3bb4f15c4982ad04a5c710ccec0fc66ba2126ccc
Author: Darafei Praliaskouski <me at komzpa.net>
Date:   Sun Aug 9 20:39:58 2026 +0400

    regress: pair SQL object resolution upgrade hooks

diff --git a/regress/core/tests.mk.in b/regress/core/tests.mk.in
index 1bf0f01bc7..18e5d96aa3 100644
--- a/regress/core/tests.mk.in
+++ b/regress/core/tests.mk.in
@@ -24,6 +24,7 @@ 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
new file mode 100644
index 0000000000..4685f6ad63
--- /dev/null
+++ b/regress/hooks/hook-after-upgrade-sql-object-resolution.sql
@@ -0,0 +1,28 @@
+-- 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 0edec59411..64ce9d770c 100644
--- a/regress/hooks/hook-after-upgrade.sql
+++ b/regress/hooks/hook-after-upgrade.sql
@@ -10,34 +10,6 @@ DROP VIEW IF EXISTS upgrade_view_test_clusterkmeans;
 DROP VIEW IF EXISTS upgrade_view_test_distance;
 DROP TABLE IF EXISTS upgrade_test;
 
-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;
 
diff --git a/regress/runtest.mk b/regress/runtest.mk
index 4b95b7e372..3deb0a8726 100644
--- a/regress/runtest.mk
+++ b/regress/runtest.mk
@@ -50,5 +50,6 @@ check-locked-upgrade:
 	$(MAKE) check-regress \
     RUNTESTFLAGS="$(RUNTESTFLAGS) --upgrade \
       --before-upgrade-script $(top_srcdir)/regress/hooks/use-all-functions.sql \
-      --after-upgrade-script $(top_srcdir)/regress/hooks/hook-after-upgrade.sql " \
+      $(if $(filter $(top_srcdir)/regress/hooks/hook-after-upgrade.sql,$(RUNTESTFLAGS_INTERNAL)),,\
+        --after-upgrade-script $(top_srcdir)/regress/hooks/hook-after-upgrade.sql) " \
     TESTS=$(top_srcdir)/regress/core/regress.sql

-----------------------------------------------------------------------

Summary of changes:
 regress/core/tests.mk.in                           |  1 +
 .../hook-after-upgrade-sql-object-resolution.sql   | 28 ++++++++++++++++++++++
 regress/hooks/hook-after-upgrade.sql               | 28 ----------------------
 regress/runtest.mk                                 |  3 ++-
 4 files changed, 31 insertions(+), 29 deletions(-)
 create mode 100644 regress/hooks/hook-after-upgrade-sql-object-resolution.sql


hooks/post-receive
-- 
PostGIS