[SCM] PostGIS branch stable-3.2 updated. 3.2.10-69-gd34227551
git at osgeo.org
git at osgeo.org
Sun Jul 19 06:02:07 PDT 2026
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, stable-3.2 has been updated
via d3422755140c9a93196410f0e4087cb2dd0c043d (commit)
via 0e88cae05c442b402fe2776887bb79f29fc34bc1 (commit)
via 7375fdfe094839dcec71d66ff8e78ee7002a4e39 (commit)
via 8e0bf544e5af1903c823f4ba18dff1c23acaca90 (commit)
via 4bcae0d154b7343fccdb1f00597abf6281b660d8 (commit)
via d213be3b71c9fd7c61d1d21c7af8625b55ca02b5 (commit)
via 4290b96cc900b54aec2e7d5dba337b0ae8f77ae5 (commit)
from 2294770eb30ed519d5030f085a19826d034e9dd1 (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 d3422755140c9a93196410f0e4087cb2dd0c043d
Merge: 2294770eb 0e88cae05
Author: Darafei Praliaskouski <komzpa at gmail.com>
Date: Sun Jul 19 06:02:06 2026 -0700
Merge pull request 'upgrade: repair stable 3.2 upgrade CI hooks' (!395) from Komzpa/postgis:ci/upgrade-hook-idempotent-3.2 into stable-3.2
Reviewed-on: https://gitea.osgeo.org/postgis/postgis/pulls/395
commit 0e88cae05c442b402fe2776887bb79f29fc34bc1
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Sun Jul 19 16:29:37 2026 +0400
ci: use pg_ctl_options for start timeout
diff --git a/ci/dronie/postgis_regress.sh b/ci/dronie/postgis_regress.sh
index 7460b079d..15a781528 100644
--- a/ci/dronie/postgis_regress.sh
+++ b/ci/dronie/postgis_regress.sh
@@ -3,7 +3,7 @@
# Exit on first error
set -e
-printf '%s\n' '-t 300' > /etc/postgresql/$PGVER/main/pg_ctl.conf
+printf '%s\n' "pg_ctl_options = '-t 300'" > /etc/postgresql/$PGVER/main/pg_ctl.conf
service postgresql start $PGVER
export PGPORT=`grep ^port /etc/postgresql/$PGVER/main/postgresql.conf | awk '{print $3}'`
export PATH=/usr/lib/postgresql/$PGVER/bin:$PATH
commit 7375fdfe094839dcec71d66ff8e78ee7002a4e39
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Sun Jul 19 16:03:27 2026 +0400
ci: extend PostgreSQL start timeout
diff --git a/ci/dronie/postgis_regress.sh b/ci/dronie/postgis_regress.sh
index 67caf8719..7460b079d 100644
--- a/ci/dronie/postgis_regress.sh
+++ b/ci/dronie/postgis_regress.sh
@@ -3,6 +3,7 @@
# Exit on first error
set -e
+printf '%s\n' '-t 300' > /etc/postgresql/$PGVER/main/pg_ctl.conf
service postgresql start $PGVER
export PGPORT=`grep ^port /etc/postgresql/$PGVER/main/postgresql.conf | awk '{print $3}'`
export PATH=/usr/lib/postgresql/$PGVER/bin:$PATH
commit 8e0bf544e5af1903c823f4ba18dff1c23acaca90
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Sun Jul 19 15:55:52 2026 +0400
upgrade: detect downgrades from installed scripts
diff --git a/utils/postgis_proc_upgrade.pl b/utils/postgis_proc_upgrade.pl
index b26125cd7..6877bd5b2 100755
--- a/utils/postgis_proc_upgrade.pl
+++ b/utils/postgis_proc_upgrade.pl
@@ -704,24 +704,8 @@ DECLARE
postgis_upgrade_info RECORD;
postgis_upgrade_info_func_code TEXT;
BEGIN
- --
- -- This uses postgis_lib_version() rather then
- -- MODULE_scripts_installed() as in 1.0 because
- -- in the 1.0 => 1.1 transition that would result
- -- in an impossible upgrade:
- --
- -- from 0.3.0 to 1.1.0
- --
- -- Next releases will still be ok as
- -- postgis_lib_version() and MODULE_scripts_installed()
- -- would both return actual PostGIS release number.
- --
- BEGIN
- SELECT into old_scripts MODULE_lib_version();
- EXCEPTION WHEN OTHERS THEN
- RAISE DEBUG 'Got %', SQLERRM;
- SELECT into old_scripts MODULE_scripts_installed();
- END;
+
+ old_scripts := MODULE_scripts_installed();
SELECT into new_scripts 'NEWVERSION';
BEGIN
commit 4bcae0d154b7343fccdb1f00597abf6281b660d8
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Sun Jul 19 03:55:09 2026 +0400
utils: compare upgrade versions numerically
diff --git a/utils/check_all_upgrades.sh b/utils/check_all_upgrades.sh
index bf2c7f5d3..e882c9b35 100755
--- a/utils/check_all_upgrades.sh
+++ b/utils/check_all_upgrades.sh
@@ -70,6 +70,16 @@ semver_compare()
echo 1; return;
fi
V2=`echo "$V2" | cut -d. -sf2-`
+ v1_numeric=`echo "$v1" | sed 's/[^0-9].*//'`
+ v2_numeric=`echo "$v2" | sed 's/[^0-9].*//'`
+ if test -n "$v1_numeric" && test -n "$v2_numeric"; then
+ if [ "$v1_numeric" -lt "$v2_numeric" ]; then
+ echo -1; return;
+ fi
+ if [ "$v1_numeric" -gt "$v2_numeric" ]; then
+ echo 1; return;
+ fi
+ fi
# echo "v: $v1 - $v2" >&2
if expr "$v1" '<' "$v2" > /dev/null; then
echo -1; return;
@@ -291,6 +301,21 @@ check_all_upgrades_selftest()
exit 1
fi
grep -q '^FAIL: self-test downgrade gave some other error:' ${test_tmp}/other.out
+
+ if test "`semver_compare 3.2.7 3.2.11dev`" != "-1"; then
+ echo "FAIL: expected 3.2.7 to compare older than 3.2.11dev" >&2
+ exit 1
+ fi
+
+ if test "`semver_compare 3.2.11dev 3.2.7`" != "1"; then
+ echo "FAIL: expected 3.2.11dev to compare newer than 3.2.7" >&2
+ exit 1
+ fi
+
+ if test "`semver_compare 3.2.11dev 3.2.11dev`" != "0"; then
+ echo "FAIL: expected identical dev versions to compare equal" >&2
+ exit 1
+ fi
}
if test "${SELFTEST}" = 1; then
commit d213be3b71c9fd7c61d1d21c7af8625b55ca02b5
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Sun Jul 19 03:45:11 2026 +0400
ci: guard optional upgrade hook on stable 3.2
diff --git a/utils/check_all_upgrades.sh b/utils/check_all_upgrades.sh
index 21db872d2..bf2c7f5d3 100755
--- a/utils/check_all_upgrades.sh
+++ b/utils/check_all_upgrades.sh
@@ -339,11 +339,16 @@ echo "INFO: installed extensions: $INSTALLED_EXTENSIONS"
USERTESTFLAGS=${RUNTESTFLAGS}
-# Make use of all public functions defined by source version
-# and use double-upgrade
+# Make use of all public functions defined by source version when the
+# branch carries that hook, and use double-upgrade.
+if test -f "${SRCDIR}/regress/hooks/use-all-functions.sql"; then
+ USERTESTFLAGS="\
+ ${USERTESTFLAGS} \
+ --before-upgrade-script ${SRCDIR}/regress/hooks/use-all-functions.sql \
+ "
+fi
USERTESTFLAGS="\
${USERTESTFLAGS} \
- --before-upgrade-script ${SRCDIR}/regress/hooks/use-all-functions.sql \
--after-upgrade-script ${SRCDIR}/regress/hooks/hook-after-upgrade.sql \
"
commit 4290b96cc900b54aec2e7d5dba337b0ae8f77ae5
Author: Darafei Praliaskouski <me at komzpa.net>
Date: Sun Jul 19 02:44:46 2026 +0400
Make upgrade hook cleanup idempotent
diff --git a/regress/hooks/hook-after-upgrade.sql b/regress/hooks/hook-after-upgrade.sql
index 51faf3ef5..1a0886233 100644
--- a/regress/hooks/hook-after-upgrade.sql
+++ b/regress/hooks/hook-after-upgrade.sql
@@ -7,7 +7,7 @@ DROP VIEW IF EXISTS upgrade_view_test_askml;
DROP VIEW IF EXISTS upgrade_view_test_dwithin;
DROP VIEW IF EXISTS upgrade_view_test_clusterkmeans;
DROP VIEW IF EXISTS upgrade_view_test_distance;
-DROP TABLE upgrade_test;
+DROP TABLE IF EXISTS upgrade_test;
-- Drop functions deprecated on upgrade
DROP FUNCTION IF EXISTS st_force3dz_deprecated_by_postgis_301(geometry);
-----------------------------------------------------------------------
Summary of changes:
ci/dronie/postgis_regress.sh | 1 +
regress/hooks/hook-after-upgrade.sql | 2 +-
utils/check_all_upgrades.sh | 36 +++++++++++++++++++++++++++++++++---
utils/postgis_proc_upgrade.pl | 20 ++------------------
4 files changed, 37 insertions(+), 22 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list