[postgis-tickets] [SCM] PostGIS branch stable-3.0 updated. 3.0.7-21-g7c2ecd13e
git at osgeo.org
git at osgeo.org
Thu Nov 10 05:49:26 PST 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, stable-3.0 has been updated
via 7c2ecd13ecd3dd860c18327b3bed9d058f3e107c (commit)
from cca1f48bd4705ff719ae7f5ad020c57f409d50c2 (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 7c2ecd13ecd3dd860c18327b3bed9d058f3e107c
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Nov 10 13:02:34 2022 +0100
Re-enable upgrade-with-data tests
References #5214 for 3.0 branch
diff --git a/raster/test/regress/Makefile.in b/raster/test/regress/Makefile.in
index c0b139ef1..9c9947e24 100644
--- a/raster/test/regress/Makefile.in
+++ b/raster/test/regress/Makefile.in
@@ -184,5 +184,11 @@ check:
$(PERL) ../../../regress/run_test.pl --raster $(RUNTESTFLAGS) $(TESTS)
# only run upgrade test if RUNTESTFLAGS was not already doing that
if echo "$(RUNTESTFLAGS)" | grep -vq -- --upgrade; then \
- $(PERL) ../../../regress/run_test.pl --upgrade --raster $(RUNTESTFLAGS) $(TESTS); \
+ $(PERL) ../../../regress/run_test.pl \
+ --raster \
+ --upgrade \
+ --before-upgrade-script hooks/hook-before-upgrade-raster.sql \
+ --after-upgrade-script hooks/hook-after-upgrade-raster.sql \
+ $(RUNTESTFLAGS) \
+ $(TESTS); \
fi
diff --git a/raster/test/regress/hooks/hook-after-upgrade-raster.sql b/raster/test/regress/hooks/hook-after-upgrade-raster.sql
new file mode 100644
index 000000000..49f51173b
--- /dev/null
+++ b/raster/test/regress/hooks/hook-after-upgrade-raster.sql
@@ -0,0 +1 @@
+DROP TABLE upgrade_test_raster;
diff --git a/raster/test/regress/hooks/hook-before-upgrade-raster.sql b/raster/test/regress/hooks/hook-before-upgrade-raster.sql
new file mode 100644
index 000000000..8c000dbaf
--- /dev/null
+++ b/raster/test/regress/hooks/hook-before-upgrade-raster.sql
@@ -0,0 +1,16 @@
+CREATE TABLE upgrade_test_raster(r raster);
+INSERT INTO upgrade_test_raster(r) VALUES
+(
+ ST_AddBand(
+ ST_MakeEmptyRaster(
+ 10, 10, 1, 1, 2, 2, 0, 0,4326
+ ),
+ 1,
+ '8BSI'::text,
+ -129,
+ NULL
+ )
+);
+
+--SET client_min_messages TO ERROR;
+SELECT AddRasterConstraints('upgrade_test_raster', 'r');
diff --git a/regress/core/Makefile.in b/regress/core/Makefile.in
index f98dd86f6..eae41c5f1 100644
--- a/regress/core/Makefile.in
+++ b/regress/core/Makefile.in
@@ -232,7 +232,12 @@ test check:
$(PERL) ../run_test.pl $(RUNTESTFLAGS) $(TESTS)
# only run upgrade test if RUNTESTFLAGS was not already doing that
if echo "$(RUNTESTFLAGS)" | grep -vq -- --upgrade; then \
- $(PERL) ../run_test.pl --upgrade $(RUNTESTFLAGS) $(TESTS); \
+ $(PERL) ../run_test.pl \
+ --upgrade \
+ --before-upgrade-script ../hooks/hook-before-upgrade.sql \
+ --after-upgrade-script ../hooks/hook-after-upgrade.sql \
+ $(RUNTESTFLAGS) \
+ $(TESTS); \
fi
check-long:
diff --git a/regress/core/tests.mk b/regress/core/tests.mk
deleted file mode 100644
index ac83a58e3..000000000
--- a/regress/core/tests.mk
+++ /dev/null
@@ -1,181 +0,0 @@
-# **********************************************************************
-# *
-# * PostGIS - Spatial Types for PostgreSQL
-# * http://postgis.net
-# *
-# * Copyright (C) 2011-2020 Sandro Santilli <strk at kbt.io>
-# * Copyright (C) 2009-2011 Paul Ramsey <pramsey at cleverelephant.ca>
-# * Copyright (C) 2008-2009 Mark Cave-Ayland
-# *
-# * This is free software; you can redistribute and/or modify it under
-# * the terms of the GNU General Public Licence. See the COPYING file.
-# *
-# **********************************************************************
-
-POSTGIS_PGSQL_VERSION=130
-POSTGIS_GEOS_VERSION=39
-HAVE_JSON=yes
-HAVE_SPGIST=yes
-INTERRUPTTESTS=no
-
-current_dir := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
-
-TESTS += \
- $(topsrcdir)/regress/core/affine \
- $(topsrcdir)/regress/core/bestsrid \
- $(topsrcdir)/regress/core/binary \
- $(topsrcdir)/regress/core/boundary \
- $(topsrcdir)/regress/core/chaikin \
- $(topsrcdir)/regress/core/filterm \
- $(topsrcdir)/regress/core/cluster \
- $(topsrcdir)/regress/core/concave_hull\
- $(topsrcdir)/regress/core/ctors \
- $(topsrcdir)/regress/core/curvetoline \
- $(topsrcdir)/regress/core/dump \
- $(topsrcdir)/regress/core/dumppoints \
- $(topsrcdir)/regress/core/empty \
- $(topsrcdir)/regress/core/estimatedextent \
- $(topsrcdir)/regress/core/forcecurve \
- $(topsrcdir)/regress/core/geography \
- $(topsrcdir)/regress/core/geometric_median \
- $(topsrcdir)/regress/core/hausdorff \
- $(topsrcdir)/regress/core/in_geohash \
- $(topsrcdir)/regress/core/in_gml \
- $(topsrcdir)/regress/core/in_kml \
- $(topsrcdir)/regress/core/in_encodedpolyline \
- $(topsrcdir)/regress/core/iscollection \
- $(topsrcdir)/regress/core/legacy \
- $(topsrcdir)/regress/core/long_xact \
- $(topsrcdir)/regress/core/lwgeom_regress \
- $(topsrcdir)/regress/core/measures \
- $(topsrcdir)/regress/core/minimum_bounding_circle \
- $(topsrcdir)/regress/core/normalize \
- $(topsrcdir)/regress/core/operators \
- $(topsrcdir)/regress/core/orientation \
- $(topsrcdir)/regress/core/out_geometry \
- $(topsrcdir)/regress/core/out_geography \
- $(topsrcdir)/regress/core/polygonize \
- $(topsrcdir)/regress/core/polyhedralsurface \
- $(topsrcdir)/regress/core/postgis_type_name \
- $(topsrcdir)/regress/core/quantize_coordinates \
- $(topsrcdir)/regress/core/regress \
- $(topsrcdir)/regress/core/regress_bdpoly \
- $(topsrcdir)/regress/core/regress_buffer_params \
- $(topsrcdir)/regress/core/regress_gist_index_nd \
- $(topsrcdir)/regress/core/regress_index \
- $(topsrcdir)/regress/core/regress_index_nulls \
- $(topsrcdir)/regress/core/regress_management \
- $(topsrcdir)/regress/core/regress_selectivity \
- $(topsrcdir)/regress/core/regress_lrs \
- $(topsrcdir)/regress/core/regress_ogc \
- $(topsrcdir)/regress/core/regress_ogc_cover \
- $(topsrcdir)/regress/core/regress_ogc_prep \
- $(topsrcdir)/regress/core/regress_proj \
- $(topsrcdir)/regress/core/relate \
- $(topsrcdir)/regress/core/remove_repeated_points \
- $(topsrcdir)/regress/core/removepoint \
- $(topsrcdir)/regress/core/reverse \
- $(topsrcdir)/regress/core/setpoint \
- $(topsrcdir)/regress/core/simplify \
- $(topsrcdir)/regress/core/simplifyvw \
- $(topsrcdir)/regress/core/size \
- $(topsrcdir)/regress/core/snaptogrid \
- $(topsrcdir)/regress/core/split \
- $(topsrcdir)/regress/core/sql-mm-serialize \
- $(topsrcdir)/regress/core/sql-mm-circularstring \
- $(topsrcdir)/regress/core/sql-mm-compoundcurve \
- $(topsrcdir)/regress/core/sql-mm-curvepoly \
- $(topsrcdir)/regress/core/sql-mm-general \
- $(topsrcdir)/regress/core/sql-mm-multicurve \
- $(topsrcdir)/regress/core/sql-mm-multisurface \
- $(topsrcdir)/regress/core/swapordinates \
- $(topsrcdir)/regress/core/summary \
- $(topsrcdir)/regress/core/temporal \
- $(topsrcdir)/regress/core/temporal_knn \
- $(topsrcdir)/regress/core/tickets \
- $(topsrcdir)/regress/core/twkb \
- $(topsrcdir)/regress/core/typmod \
- $(topsrcdir)/regress/core/wkb \
- $(topsrcdir)/regress/core/wkt \
- $(topsrcdir)/regress/core/wmsservers \
- $(topsrcdir)/regress/core/offsetcurve \
- $(topsrcdir)/regress/core/relatematch \
- $(topsrcdir)/regress/core/isvaliddetail \
- $(topsrcdir)/regress/core/sharedpaths \
- $(topsrcdir)/regress/core/snap \
- $(topsrcdir)/regress/core/node \
- $(topsrcdir)/regress/core/unaryunion \
- $(topsrcdir)/regress/core/clean \
- $(topsrcdir)/regress/core/relate_bnr \
- $(topsrcdir)/regress/core/delaunaytriangles \
- $(topsrcdir)/regress/core/clipbybox2d \
- $(topsrcdir)/regress/core/subdivide \
- $(topsrcdir)/regress/core/voronoi \
- $(topsrcdir)/regress/core/regress_brin_index \
- $(topsrcdir)/regress/core/regress_brin_index_3d \
- $(topsrcdir)/regress/core/regress_brin_index_geography \
- $(topsrcdir)/regress/core/minimum_clearance \
- $(topsrcdir)/regress/core/oriented_envelope \
- $(topsrcdir)/regress/core/point_coordinates \
- $(topsrcdir)/regress/core/out_geojson
-
-# Slow slow tests
-TESTS_SLOW = \
- $(topsrcdir)/regress/core/concave_hull_hard \
- $(topsrcdir)/regress/core/knn_recheck
-
-ifeq ($(shell expr "$(POSTGIS_PGSQL_VERSION)" ">=" 120),1)
- TESTS += \
- $(topsrcdir)/regress/core/computed_columns
-endif
-
-ifeq ($(shell expr "$(POSTGIS_GEOS_VERSION)" ">=" 37),1)
- # GEOS-3.7 adds:
- # ST_FrechetDistance
- TESTS += \
- $(topsrcdir)/regress/core/frechet
-endif
-
-ifeq ($(shell expr "$(POSTGIS_GEOS_VERSION)" ">=" 38),1)
- # GEOS-3.8 adds stable pointonsurface implementation
- TESTS += \
- $(topsrcdir)/regress/core/geos38
-endif
-
-ifeq ($(shell expr "$(POSTGIS_GEOS_VERSION)" ">=" 39),1)
- # GEOS-3.0 adds stable maximuminscribedcircle implementation
- TESTS += \
- $(topsrcdir)/regress/core/geos39 \
- $(topsrcdir)/regress/core/fixedoverlay
-endif
-
-ifeq ($(INTERRUPTTESTS),yes)
- # Allow CI servers to configure --with-interrupt-tests
- TESTS += \
- $(topsrcdir)/regress/core/interrupt \
- $(topsrcdir)/regress/core/interrupt_relate \
- $(topsrcdir)/regress/core/interrupt_buffer
-endif
-
-ifeq ($(HAVE_JSON),yes)
- # JSON-C adds:
- # ST_GeomFromGeoJSON()
- TESTS += \
- $(topsrcdir)/regress/core/in_geojson
-endif
-
-ifeq ($(HAVE_SPGIST),yes)
- TESTS += \
- $(topsrcdir)/regress/core/regress_spgist_index_2d \
- $(topsrcdir)/regress/core/regress_spgist_index_3d \
- $(topsrcdir)/regress/core/regress_spgist_index_nd
-endif
-
-ifeq (yes,yes)
- # protobuf-c adds:
- # ST_AsMVT, ST_AsGeobuf
- TESTS += \
- $(topsrcdir)/regress/core/mvt \
- $(topsrcdir)/regress/core/mvt_jsonb \
- $(topsrcdir)/regress/core/geobuf
-endif
diff --git a/regress/hooks/hook-after-upgrade.sql b/regress/hooks/hook-after-upgrade.sql
new file mode 100644
index 000000000..459f80249
--- /dev/null
+++ b/regress/hooks/hook-after-upgrade.sql
@@ -0,0 +1,2 @@
+DROP VIEW IF EXISTS upgrade_view_test;
+DROP TABLE upgrade_test;
diff --git a/regress/hooks/hook-before-upgrade.sql b/regress/hooks/hook-before-upgrade.sql
new file mode 100644
index 000000000..d4bcb8cd6
--- /dev/null
+++ b/regress/hooks/hook-before-upgrade.sql
@@ -0,0 +1,26 @@
+CREATE TABLE upgrade_test(g1 geometry, g2 geography);
+INSERT INTO upgrade_test(g1,g2) VALUES
+('POINT(0 0)', 'LINESTRING(0 0, 1 1)'),
+('POINT(1 0)', 'LINESTRING(0 1, 1 1)');
+
+-- We know upgrading with an st_union() based view
+-- fails unless you're on PostgreSQL 12, so we don't
+-- even try that.
+--
+-- We could re-enable this test IF we fix the upgrade
+-- in pre-12 versions. Refer to
+-- https://trac.osgeo.org/postgis/ticket/4386
+--
+DO $BODY$
+DECLARE
+ vernum INT;
+BEGIN
+ show server_version_num INTO vernum;
+ IF vernum >= 120000
+ THEN
+ RAISE DEBUG '12+ server (%)', vernum;
+ CREATE VIEW upgrade_view_test AS
+ SELECT ST_Union(g1) FROM upgrade_test;
+ END IF;
+END;
+$BODY$ LANGUAGE 'plpgsql';
diff --git a/topology/test/Makefile.in b/topology/test/Makefile.in
index b4c1c06f7..fc64d6825 100644
--- a/topology/test/Makefile.in
+++ b/topology/test/Makefile.in
@@ -92,5 +92,11 @@ check-regress: topo_predicates.sql load_topology.sql load_topology-4326.sql $(TE
$(PERL) ../../regress/run_test.pl --topology $(RUNTESTFLAGS) $(TESTS)
# only run upgrade test if RUNTESTFLAGS was not already doing that
if echo "$(RUNTESTFLAGS)" | grep -vq -- --upgrade; then \
- $(PERL) ../../regress/run_test.pl --upgrade --topology $(RUNTESTFLAGS) $(TESTS); \
+ $(PERL) ../../regress/run_test.pl \
+ --upgrade \
+ --topology \
+ --before-upgrade-script regress/hooks/hook-before-upgrade-topology.sql \
+ --after-upgrade-script regress/hooks/hook-after-upgrade-topology.sql \
+ $(RUNTESTFLAGS) \
+ $(TESTS); \
fi
diff --git a/topology/test/regress/hooks/hook-after-upgrade-topology.sql b/topology/test/regress/hooks/hook-after-upgrade-topology.sql
new file mode 100644
index 000000000..c7e2e9ce8
--- /dev/null
+++ b/topology/test/regress/hooks/hook-after-upgrade-topology.sql
@@ -0,0 +1,2 @@
+SELECT topology.DropTopology('upgrade_test');
+
diff --git a/topology/test/regress/hooks/hook-before-upgrade-topology.sql b/topology/test/regress/hooks/hook-before-upgrade-topology.sql
new file mode 100644
index 000000000..9c5529f7e
--- /dev/null
+++ b/topology/test/regress/hooks/hook-before-upgrade-topology.sql
@@ -0,0 +1,2 @@
+SELECT topology.createTopology('upgrade_test');
+
-----------------------------------------------------------------------
Summary of changes:
raster/test/regress/Makefile.in | 8 +-
.../regress/hooks/hook-after-upgrade-raster.sql | 1 +
.../regress/hooks/hook-before-upgrade-raster.sql | 16 ++
regress/core/Makefile.in | 7 +-
regress/core/tests.mk | 181 ---------------------
regress/hooks/hook-after-upgrade.sql | 2 +
regress/hooks/hook-before-upgrade.sql | 26 +++
topology/test/Makefile.in | 8 +-
.../regress/hooks/hook-after-upgrade-topology.sql | 2 +
.../regress/hooks/hook-before-upgrade-topology.sql | 2 +
10 files changed, 69 insertions(+), 184 deletions(-)
create mode 100644 raster/test/regress/hooks/hook-after-upgrade-raster.sql
create mode 100644 raster/test/regress/hooks/hook-before-upgrade-raster.sql
delete mode 100644 regress/core/tests.mk
create mode 100644 regress/hooks/hook-after-upgrade.sql
create mode 100644 regress/hooks/hook-before-upgrade.sql
create mode 100644 topology/test/regress/hooks/hook-after-upgrade-topology.sql
create mode 100644 topology/test/regress/hooks/hook-before-upgrade-topology.sql
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list