[postgis-tickets] [SCM] PostGIS branch stable-3.4 updated. 3.4.0-37-g9c44d61fd
git at osgeo.org
git at osgeo.org
Tue Oct 17 13:50:56 PDT 2023
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.4 has been updated
via 9c44d61fdcb9c8ef54c82ee6e15a29df985cadf9 (commit)
via 569c54eb4f99808b5b964e49b2142fcaed850701 (commit)
via 760f34e152867c847ec8b7aec42e2ed78c547678 (commit)
via 13a4201c6dbb96259b293f7b7cde0775783900bb (commit)
from b328e7452793eec40978f61e65d5c47d0198bc6e (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 9c44d61fdcb9c8ef54c82ee6e15a29df985cadf9
Author: Sandro Santilli <strk at kbt.io>
Date: Tue Oct 17 22:39:17 2023 +0200
Fix restore of dumps with topology from 3.1
Closes #5577 in 3.4 branch (3.4.1dev)
diff --git a/NEWS b/NEWS
index 546e4d82f..9d02a0a8a 100644
--- a/NEWS
+++ b/NEWS
@@ -7,7 +7,7 @@ To take advantage of all SFCGAL featurs, SFCGAL 1.4.1+ is needed.
* Bug Fixes *
- - #5574, #5575, #5576, Fix restore of postgis dumps from 3.0 (Sandro Santilli)
+ - #5574, #5575, #5576, #5577, Fix restore of postgis dumps (Sandro Santilli)
- #5568, Improve robustness of topology face split handling (Sandro Santilli)
- #5548, Fix box-filtered validity check of topologies with edge-less faces
(Sandro Santilli)
diff --git a/topology/topology_before_upgrade.sql.in b/topology/topology_before_upgrade.sql.in
index aa0c7252f..bf4104c0d 100644
--- a/topology/topology_before_upgrade.sql.in
+++ b/topology/topology_before_upgrade.sql.in
@@ -13,34 +13,20 @@
-- argument names changed --
-- we might want to take toTopoGeom one out before release since
-- I don't think too many people installed the bad name
-SELECT NULL FROM _postgis_drop_function_by_signature('
-topology.toTopoGeom(Geometry, varchar, int, float8)
-');
+SELECT _postgis_drop_function_by_signature('topology.toTopoGeom(Geometry, varchar, int, float8)');
-- used to be in public, will now be moved to topology
-SELECT NULL FROM _postgis_drop_function_by_signature('
-public.postgis_topology_scripts_installed()
-');
+SELECT _postgis_drop_function_by_signature('public.postgis_topology_scripts_installed()');
-- Removed in 2.2.0 when topology API moved to liblwgeom
-SELECT NULL FROM _postgis_drop_function_by_signature('
-topology._ST_RemEdgeCheck(varchar, integer, integer, integer, integer)
-', '2.2.0');
+SELECT _postgis_drop_function_by_signature('topology._ST_RemEdgeCheck(varchar, integer, integer, integer, integer)', '2.2.0');
-- Removed in 2.2.0 when topology API moved to liblwgeom
-SELECT NULL FROM _postgis_drop_function_by_signature('
-topology._ST_AddFaceSplit(varchar, integer, integer, boolean)
-', '2.2.0');
+SELECT _postgis_drop_function_by_signature('topology._ST_AddFaceSplit(varchar, integer, integer, boolean)', '2.2.0');
-- Added optional bbox parameter in 3.2.0
-SELECT NULL FROM _postgis_drop_function_by_signature('
-topology.validatetopology(varchar)
-', '3.2.0');
+SELECT _postgis_drop_function_by_signature('topology.validatetopology(varchar)', '3.2.0');
-- Merged the two function into one with both allowEdgeSplitting and setContainingFace parameters
-- being optional (3.2.0)
-SELECT NULL FROM _postgis_drop_function_by_signature('
-topology.AddNode(varchar, geometry)
-', '3.2.0');
-SELECT NULL FROM _postgis_drop_function_by_signature('
-topology.AddNode(varchar, geometry, boolean, boolean)
-', '3.2.0');
+SELECT _postgis_drop_function_by_signature('topology.AddNode(varchar, geometry)', '3.2.0');
+SELECT _postgis_drop_function_by_signature('topology.AddNode(varchar, geometry, boolean, boolean)', '3.2.0');
diff --git a/utils/create_skip_signatures.pl b/utils/create_skip_signatures.pl
index 9995d4127..7d67fda0a 100644
--- a/utils/create_skip_signatures.pl
+++ b/utils/create_skip_signatures.pl
@@ -205,12 +205,12 @@ while (<>)
# Deprecated function signature using
# _postgis_drop_function_by_signature
# EXAMPLE: SELECT _postgis_drop_function_by_signature('pgis_geometry_union_finalfn(internal)');
- elsif ( /SELECT _postgis_drop_function_by_signature\('[^']*'\);/ )
+ elsif ( /SELECT _postgis_drop_function_by_signature\('[^']*'/ )
{
my $origline = $_;
my $line = $origline;
- $line =~ s/SELECT _postgis_drop_function_by_signature\('([^']*)'\);/$1/;
+ $line =~ s/.*SELECT _postgis_drop_function_by_signature\('([^']*)'.*/$1/;
handle_function_signature($line);
}
commit 569c54eb4f99808b5b964e49b2142fcaed850701
Author: Sandro Santilli <strk at kbt.io>
Date: Tue Oct 17 21:57:06 2023 +0200
Do not print info messages on stderr unless -v is given
diff --git a/utils/postgis_restore.pl.in b/utils/postgis_restore.pl.in
index a99a3d23f..e4115a77e 100644
--- a/utils/postgis_restore.pl.in
+++ b/utils/postgis_restore.pl.in
@@ -92,7 +92,8 @@ die "$me:\tUnable to find 'pg_dump' on the path.\n" if ! `pg_dump --version`;
die "$me:\tUnable to find 'pg_restore' on the path.\n" if ! `pg_restore --version`;
die "$me:\tUnable to open dump file '$dumpfile'.\n" if ! -r $dumpfile;
-print STDERR "Converting $dumpfile to ASCII on stdout...\n";
+print STDERR "Converting $dumpfile to ASCII on stdout...\n"
+ if $DEBUG;
STDOUT->autoflush(1);
@@ -100,7 +101,8 @@ STDOUT->autoflush(1);
# Load the signatures of things to skip.
#
-print STDERR " Reading list of functions to ignore...\n";
+print STDERR " Reading list of functions to ignore...\n"
+ if $DEBUG;
my %skip = ();
while(my $l = <DATA>) {
@@ -116,7 +118,8 @@ while(my $l = <DATA>) {
#
if(!defined($POSTGIS_TOC)) {
- print STDERR " Writing manifest of things to read from dump file...\n";
+ print STDERR " Writing manifest of things to read from dump file...\n"
+ if $DEBUG;
open( DUMP, "pg_restore -f - -l $dumpfile |" ) || die "$me:\tCannot open dump file '$dumpfile'\n";
} else {
@@ -135,7 +138,8 @@ while( my $l = <DUMP> ) {
if ( $l =~ / TABLE DATA ([^ ]*) spatial_ref_sys / )
{
$POSTGIS_SCHEMA = $1;
- print STDERR "Setting postgis schema to $POSTGIS_SCHEMA, as found in the dump";
+ print STDERR " Setting postgis schema to $POSTGIS_SCHEMA, as found in the dump\n"
+ if $DEBUG;
}
}
@@ -154,7 +158,8 @@ close(DUMP) || die "$me: pg_restore returned an error\n";
# Convert the dump file into an ASCII file, stripping out the
# unwanted bits.
#
-print STDERR " Writing ASCII to stdout...\n";
+print STDERR " Writing ASCII to stdout...\n"
+ if $DEBUG;
open( INPUT, "pg_restore -f - -L $manifest $dumpfile |") || die "$me:\tCan't run pg_restore\n";
if ( defined $POSTGIS_SCHEMA ) {
commit 760f34e152867c847ec8b7aec42e2ed78c547678
Author: Sandro Santilli <strk at kbt.io>
Date: Tue Oct 17 20:53:36 2023 +0200
Fix `\1 better written as $1` perl warnings
diff --git a/utils/create_skip_signatures.pl b/utils/create_skip_signatures.pl
index 32a571a1f..9995d4127 100644
--- a/utils/create_skip_signatures.pl
+++ b/utils/create_skip_signatures.pl
@@ -197,7 +197,7 @@ while (<>)
my $origline = $_;
my $line = $origline;
- $line =~ s/ *ALTER FUNCTION (.*) RENAME TO .*_deprecated_by_postgis_.*/\1/;
+ $line =~ s/ *ALTER FUNCTION (.*) RENAME TO .*_deprecated_by_postgis_.*/$1/;
handle_function_signature($line);
}
@@ -210,7 +210,7 @@ while (<>)
my $origline = $_;
my $line = $origline;
- $line =~ s/SELECT _postgis_drop_function_by_signature\('([^']*)'\);/\1/;
+ $line =~ s/SELECT _postgis_drop_function_by_signature\('([^']*)'\);/$1/;
handle_function_signature($line);
}
commit 13a4201c6dbb96259b293f7b7cde0775783900bb
Author: Sandro Santilli <strk at kbt.io>
Date: Tue Oct 17 20:54:01 2023 +0200
Remove needlessly hard-coded skip signatures
See https://woodie.osgeo.org/repos/30/pipeline/1323/7#L2093
diff --git a/utils/postgis_restore.pl.in b/utils/postgis_restore.pl.in
index 1f1b8f64e..a99a3d23f 100644
--- a/utils/postgis_restore.pl.in
+++ b/utils/postgis_restore.pl.in
@@ -563,7 +563,6 @@ COMMENT FUNCTION addrasterconstraints(rasttable name, rastcolumn name, VARIADIC
COMMENT FUNCTION droprasterconstraints(rastschema name, rasttable name, rastcolumn name, VARIADIC constraints text[])
COMMENT FUNCTION lockrow(text, text, text, text, timestamp without time zone)
COMMENT FUNCTION lockrow(text, text, text, timestamp without time zone)
-COMMENT FUNCTION postgis_extensions_upgrade()
COMMENT FUNCTION st_clusterkmeans(geom geometry, k integer)
COMMENT FUNCTION st_concavehull(param_geom geometry, param_pctconvex double precision, param_allow_holes boolean)
COMMENT FUNCTION st_difference(geom1 geometry, geom2 geometry)
@@ -615,7 +614,6 @@ COMMENT FUNCTION st_subdivide(geom geometry, maxvertices integer)
COMMENT FUNCTION st_sum4ma(matrix double precision[], nodatamode text, VARIADIC args text[])
COMMENT FUNCTION st_sum4ma(value double precision[], pos integer[], VARIADIC userargs text[])
COMMENT FUNCTION st_symdifference(geom1 geometry, geom2 geometry)
-COMMENT FUNCTION st_unaryunion(geometry)
COMMENT FUNCTION st_valuecount(rastertable text, rastercolumn text, nband integer, exclude_nodata_value boolean, searchvalues double precision[], roundto double precision, OUT value double precision, OUT count integer)
COMMENT FUNCTION st_valuecount(rastertable text, rastercolumn text, nband integer, searchvalues double precision[], roundto double precision, OUT value double precision, OUT count integer)
COMMENT FUNCTION st_valuecount(rastertable text, rastercolumn text, searchvalues double precision[], roundto double precision, OUT value double precision, OUT count integer)
@@ -638,21 +636,13 @@ FUNCTION jsonb(geometry)
FUNCTION json(geometry)
FUNCTION lockrow(text, text, text, text, timestamp without time zone)
FUNCTION lockrow(text, text, text, timestamp without time zone)
-FUNCTION postgis_extensions_upgrade()
FUNCTION _st_aspect4ma(double precision[], integer[], text[])
-FUNCTION st_clusterkmeans(geometry, integer)
FUNCTION st_concavehull(geometry, double precision, boolean)
FUNCTION _st_convertarray4ma(double precision[])
-FUNCTION st_difference(geometry, geometry)
FUNCTION st_distinct4ma(double precision[], integer[], text[])
FUNCTION st_distinct4ma(double precision[], text, text[])
-FUNCTION st_force3d(geometry)
-FUNCTION st_force3dm(geometry)
-FUNCTION st_force3dz(geometry)
-FUNCTION st_force4d(geometry)
FUNCTION _st_grayscale4ma(double precision[], integer[], text[])
FUNCTION _st_hillshade4ma(double precision[], integer[], text[])
-FUNCTION st_intersection(geometry, geometry)
FUNCTION st_invdistweight4ma(double precision[], integer[], text[])
FUNCTION _st_mapalgebra(rastbandarg[], regprocedure, text, integer, integer, text, raster, double precision[], boolean, text[])
FUNCTION st_mapalgebra(raster, integer, regprocedure, double precision[], boolean, text, text, raster, text[])
@@ -673,14 +663,10 @@ FUNCTION st_setvalues(raster, integer, integer, integer, double precision[], dou
FUNCTION _st_slope4ma(double precision[], integer[], text[])
FUNCTION st_stddev4ma(double precision[], integer[], text[])
FUNCTION st_stddev4ma(double precision[], text, text[])
-FUNCTION st_subdivide(geometry, integer)
FUNCTION st_sum4ma(double precision[], integer[], text[])
FUNCTION st_sum4ma(double precision[], text, text[])
-FUNCTION st_symdifference(geometry, geometry)
-FUNCTION st_tileenvelope(integer, integer, integer, geometry)
FUNCTION _st_tpi4ma(double precision[], integer[], text[])
FUNCTION _st_tri4ma(double precision[], integer[], text[])
-FUNCTION st_unaryunion(geometry)
OPERATOR &&
OPERATOR &&&
OPERATOR &/&
-----------------------------------------------------------------------
Summary of changes:
NEWS | 2 +-
topology/topology_before_upgrade.sql.in | 28 +++++++---------------------
utils/create_skip_signatures.pl | 6 +++---
utils/postgis_restore.pl.in | 29 ++++++++++-------------------
4 files changed, 21 insertions(+), 44 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list