[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-151-g138d591df
git at osgeo.org
git at osgeo.org
Sat Oct 1 18:25:29 PDT 2022
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 138d591dff88034d803abe8f30e6e495783bf17b (commit)
via 4e80d8d335317578df57431f9070595d935fda56 (commit)
from 94a14f36210081882d13dacf3c809992b2a58004 (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 138d591dff88034d803abe8f30e6e495783bf17b
Author: Regina Obe <lr at pcorp.us>
Date: Sat Oct 1 21:24:24 2022 -0400
Fix postgis_extensions_upgrade for same version to same version.
Tests still needed
References #5253 for PostGIS 3.4.0dev
diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in
index 798e26eea..2e50a77f5 100644
--- a/postgis/postgis.sql.in
+++ b/postgis/postgis.sql.in
@@ -3051,7 +3051,7 @@ BEGIN
END IF; --}
ELSE -- The code is already packaged, upgrade it --}{
sql = format(
- 'ALTER EXTENSION %1$I UPDATE TO ANY;',
+ 'ALTER EXTENSION %1$I UPDATE TO "ANY";'
'ALTER EXTENSION %1$I UPDATE TO %2$I',
rec.name, target_version
);
commit 4e80d8d335317578df57431f9070595d935fda56
Author: Regina Obe <lr at pcorp.us>
Date: Sat Oct 1 21:22:20 2022 -0400
winnie fialing on ANY tests.
Closes #5252
diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index c546eab84..68a2ea31d 100644
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -252,22 +252,21 @@ export UPGRADEABLE_VERSIONS=$value
#echo "Versions are: $UPGRADEABLE_VERSIONS"
export WIN_RELEASED_VERSIONS="2.0.0 2.0.1 2.0.3 2.0.4 2.0.6 2.1.4 2.1.7 2.1.8 2.2.0 2.2.3 2.3.0 2.3.7 2.4.0 2.4.4"
for EXTNAME in postgis postgis_raster postgis_topology postgis_sfcgal postgis_tiger_geocoder address_standardizer; do
- cp extensions/$EXTNAME/sql/* ${PGPATHEDB}/share/extension
+ cp extensions/$EXTNAME/sql/* ${RELDIR}/${RELVERDIR}/share/extension
+
+ cp extensions/$EXTNAME/sql/$EXTNAME--ANY--${POSTGIS_MICRO_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension/$EXTNAME--${POSTGIS_MINOR_MAX_VER}--${POSTGIS_MICRO_VER}.sql
- cp extensions/$EXTNAME/sql/$EXTNAME--ANY--${POSTGIS_MICRO_VER}.sql ${PGPATHEDB}/share/extension/$EXTNAME--${POSTGIS_MINOR_MAX_VER}--${POSTGIS_MICRO_VER}.sql
- cp extensions/$EXTNAME/sql/$EXTNAME--ANY--${POSTGIS_MICRO_VER}.sql ${PGPATHEDB}/share/extension/$EXTNAME--${POSTGIS_MICRO_VER}next--${POSTGIS_MICRO_VER}.sql
- cp extensions/$EXTNAME/sql/$EXTNAME--ANY--${POSTGIS_MICRO_VER}.sql ${PGPATHEDB}/share/extension/$EXTNAME--${POSTGIS_MICRO_VER}--${POSTGIS_MICRO_VER}next.sql
if test "$EXTNAME" = "address_standardizer"; then #repeat for address_standardizer_data_us
- cp extensions/$EXTNAME/sql/${EXTNAME}_data_us--ANY--${POSTGIS_MICRO_VER}.sql ${PGPATHEDB}/share/extension/${EXTNAME}_data_us--${POSTGIS_MINOR_MAX_VER}--${POSTGIS_MICRO_VER}.sql
- cp extensions/$EXTNAME/sql/${EXTNAME}_data_us--ANY--${POSTGIS_MICRO_VER}.sql ${PGPATHEDB}/share/extension/${EXTNAME}_data_us--${POSTGIS_MICRO_VER}next--${POSTGIS_MICRO_VER}.sql
+ cp extensions/$EXTNAME/sql/${EXTNAME}_data_us--${POSTGIS_MICRO_VER}.sql ${PGPATHEDB}/share/extension
+ cp extensions//$EXTNAME/sql/${EXTNAME}_data_us--ANY--${POSTGIS_MICRO_VER}.sql ${PGPATHEDB}/share/extension
fi
for OLD_VERSION in $UPGRADEABLE_VERSIONS; do \
if [ "$OLD_VERSION" > "2.5" ] || [ "$OLD_VERSION" in $WIN_RELEASED_VERSIONS ]; then
- cp extensions/$EXTNAME/sql/$EXTNAME--TEMPLATED--TO--ANY.sql ${PGPATHEDB}/share/extension/$EXTNAME--$OLD_VERSION--${POSTGIS_MINOR_MAX_VER}.sql; \
+ cp extensions/$EXTNAME/sql/$EXTNAME--TEMPLATED--TO--ANY.sql ${RELDIR}/${RELVERDIR}/share/extension/$EXTNAME--$OLD_VERSION--${POSTGIS_MINOR_MAX_VER}.sql; \
if test "$EXTNAME" = "address_standardizer"; then
- cp extensions/$EXTNAME/sql/$EXTNAME--TEMPLATED--TO--ANY.sql ${PGPATHEDB}/share/extension/${EXTNAME}_data_us--$OLD_VERSION--${POSTGIS_MINOR_MAX_VER}.sql; \
+ cp extensions/$EXTNAME/sql/$EXTNAME--TEMPLATED--TO--ANY.sql ${RELDIR}/${RELVERDIR}/share/extension/${EXTNAME}_data_us--$OLD_VERSION--${POSTGIS_MINOR_MAX_VER}.sql; \
fi
fi
done
@@ -283,7 +282,7 @@ cp -r extensions/*/*.dll ${RELDIR}/${RELVERDIR}/lib #only address_standardizer i
cp -r ${RELDIR}/packaging_notes/* ${RELDIR}/${RELVERDIR}/
-echo "GEOS VERSION: ${GEOS_VER} https://trac.osgeo.org/geos" >> $verfile
+echo "GEOS VERSION: ${GEOS_VER} https://github.com/libgeos/geos" >> $verfile
echo "GDAL VERSION: ${GDAL_VER} https://gdal.org/download.html#current-releases" >> $verfile
echo "PROJ VERSION: ${PROJ_VER} https://proj.org/download.html#current-release" >> $verfile
diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index 04ff56919..1dbc53d5b 100644
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -202,6 +202,7 @@ if [ "$MAKE_EXTENSION" == "1" ]; then
export POSTGIS_MINOR_VER=${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}
export POSTGIS_MINOR_MAX_VER="ANY"
+export POSTGIS_MICRO_VER=${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}
#export UPGRADE_VER_FILE="extensions/upgradeable_versions.mk"
value=$(<extensions/upgradeable_versions.mk)
@@ -213,16 +214,12 @@ export WIN_RELEASED_VERSIONS="2.0.0 2.0.1 2.0.3 2.0.4 2.0.6 2.1.4 2.1.7 2.1.8 2.
#echo "Versions are: $UPGRADEABLE_VERSIONS"
for EXTNAME in postgis postgis_raster postgis_topology postgis_sfcgal postgis_tiger_geocoder address_standardizer; do
cp extensions/$EXTNAME/sql/* ${PGPATHEDB}/share/extension
-
- cp extensions/$EXTNAME/sql/$EXTNAME--ANY--${POSTGIS_MICRO_VER}.sql ${PGPATHEDB}/share/extension/$EXTNAME--${POSTGIS_MINOR_MAX_VER}--${POSTGIS_MICRO_VER}.sql
- cp extensions/$EXTNAME/sql/$EXTNAME--ANY--${POSTGIS_MICRO_VER}.sql ${PGPATHEDB}/share/extension/$EXTNAME--${POSTGIS_MICRO_VER}next--${POSTGIS_MICRO_VER}.sql
- cp extensions/$EXTNAME/sql/$EXTNAME--ANY--${POSTGIS_MICRO_VER}.sql ${PGPATHEDB}/share/extension/$EXTNAME--${POSTGIS_MICRO_VER}--${POSTGIS_MICRO_VER}next.sql
+ cp extensions/$EXTNAME/sql/$EXTNAME--TEMPLATED--TO--ANY.sql ${PGPATHEDB}/share/extension/$EXTNAME--$POSTGIS_MICRO_VER--${POSTGIS_MINOR_MAX_VER}.sql;
if test "$EXTNAME" = "address_standardizer"; then #repeat for address_standardizer_data_us
cp extensions/$EXTNAME/sql/${EXTNAME}_data_us--${POSTGIS_MICRO_VER}.sql ${PGPATHEDB}/share/extension
- cp extensions/postgis/sql/postgis--ANY--${POSTGIS_MICRO_VER}.sql ${PGPATHEDB}/share/extension
- cp extensions/$EXTNAME/sql/${EXTNAME}_data_us--ANY--${POSTGIS_MICRO_VER}.sql ${PGPATHEDB}/share/extension/${EXTNAME}_data_us--${POSTGIS_MINOR_MAX_VER}--${POSTGIS_MICRO_VER}.sql
- cp extensions/$EXTNAME/sql/${EXTNAME}_data_us--ANY--${POSTGIS_MICRO_VER}.sql ${PGPATHEDB}/share/extension/${EXTNAME}_data_us--${POSTGIS_MICRO_VER}next--${POSTGIS_MICRO_VER}.sql
+ cp extensions//$EXTNAME/sql/${EXTNAME}_data_us--ANY--${POSTGIS_MICRO_VER}.sql ${PGPATHEDB}/share/extension
+ cp extensions/$EXTNAME/sql/${EXTNAME}--TEMPLATED--TO--ANY.sql ${PGPATHEDB}/share/extension/${EXTNAME}_data_us--$POSTGIS_MICRO_VER--ANY.sql;
fi
for OLD_VERSION in $UPGRADEABLE_VERSIONS; do \
@@ -242,21 +239,22 @@ done
make check RUNTESTFLAGS="--extension -v"
+## TODO: Put back after folder into main check setup #5254
##test address standardizer
- cd ${POSTGIS_SRC}
- cd extensions/address_standardizer
- make installcheck
+ #cd ${POSTGIS_SRC}
+ #cd extensions/address_standardizer
+ #make installcheck
##test tiger geocoder
- cd ${POSTGIS_SRC}
- cd extensions/postgis_tiger_geocoder
- make installcheck
+ #cd ${POSTGIS_SRC}
+ #cd extensions/postgis_tiger_geocoder
+ #make installcheck
if [ "$?" != "0" ]; then
exit $?
fi
fi
-if [ "$DUMP_RESTORE" = "1" ]; then
+if [ "$DUMP_RESTORE" == "1" ]; then
echo "Dum restore test"
make install
make check RUNTESTFLAGS="-v --dumprestore"
-----------------------------------------------------------------------
Summary of changes:
ci/winnie/package_postgis.sh | 17 ++++++++---------
ci/winnie/regress_postgis.sh | 26 ++++++++++++--------------
postgis/postgis.sql.in | 2 +-
3 files changed, 21 insertions(+), 24 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list