[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-654-g3fbb9c75a

[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  3fbb9c75ae56c89e43fc4334c6c18e6102113869 (commit)
       via  e5d5aa7092d34b16ebd748f431d4e5500db79ba9 (commit)
       via  a41ae889ae476e44be167e7c10df9a7f5cfc9d87 (commit)
       via  78c3fb2c8cddbb0db32bee61f1c668899eeee98e (commit)
       via  5d41fa2637e1151838bb120f24b4ad29f583b148 (commit)
       via  caf3d6f2890fc04a53bf0576e0e6afee2f9de516 (commit)
      from  87df5a875dcbc88fdeb84a85c0d9b2c648a71eae (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 3fbb9c75ae56c89e43fc4334c6c18e6102113869
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Feb 21 10:06:05 2023 +0100

    Generate topology upgrade via script
    
    Closes #5345

diff --git a/topology/Makefile.in b/topology/Makefile.in
index 3ef764309..dc5b70b29 100644
--- a/topology/Makefile.in
+++ b/topology/Makefile.in
@@ -114,14 +114,14 @@ endif
 	$(PERL) -lpe "s'MODULE_PATHNAME'\$(MODULEPATH)'g" > $@
 	rm -f $@.tmp
 
-#Generate upgrade script by stripping things that can't be reinstalled
-#e.g. don't bother with tables, types, triggers, and domains
-# TODO: use create_upgrade.pl
-topology_upgrade.sql.in:  topology.sql
-	$(PERL) -0777 -ne 's/^(CREATE|ALTER) (CAST|OPERATOR|TYPE|TABLE|SCHEMA|DOMAIN|TRIGGER).*?;//msg;print;' $< > $@
+topology_upgrade.sql.in:  topology.sql ../../utils/create_upgrade.pl
+	$(PERL) @top_srcdir@/utils/create_upgrade.pl $< > $@
+	#$(PERL) -0777 -ne 's/^(CREATE|ALTER) (CAST|OPERATOR|TYPE|TABLE|SCHEMA|DOMAIN|TRIGGER).*?;//msg;print;' $< > $@
 
 topology_upgrade.sql: topology_before_upgrade.sql topology_upgrade.sql.in topology_after_upgrade.sql
+	echo "BEGIN;" > $@
 	cat $^ > $@
+	echo "COMMIT;" >> $@
 
 topology.sql: \
 	sql/cleanup/RemoveUnusedPrimitives.sql.in \

commit e5d5aa7092d34b16ebd748f431d4e5500db79ba9
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Feb 21 10:05:54 2023 +0100

    Add availability info for TYPE topology.ValidateTopology_ReturnType

diff --git a/topology/sql/manage/ValidateTopology.sql.in b/topology/sql/manage/ValidateTopology.sql.in
index e36e036ee..e788bcdf7 100644
--- a/topology/sql/manage/ValidateTopology.sql.in
+++ b/topology/sql/manage/ValidateTopology.sql.in
@@ -17,6 +17,8 @@
 --
 -- Type returned by ValidateTopology
 --
+-- Availability: 1.1.0
+--
 CREATE TYPE topology.ValidateTopology_ReturnType AS (
   error varchar,
   id1 integer,

commit a41ae889ae476e44be167e7c10df9a7f5cfc9d87
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Feb 21 10:04:15 2023 +0100

    Fix availability comment format for AGGREGATE topology.TopoElementArray_agg

diff --git a/topology/sql/topoelement/topoelement_agg.sql.in b/topology/sql/topoelement/topoelement_agg.sql.in
index af3a78fd0..d27a068da 100644
--- a/topology/sql/topoelement/topoelement_agg.sql.in
+++ b/topology/sql/topoelement/topoelement_agg.sql.in
@@ -49,8 +49,11 @@ LANGUAGE 'sql' IMMUTABLE;
 --
 -- Aggregates a set of TopoElement values into a TopoElementArray
 --
--- Availability: 2.0.0
+-- This DROP should probably be removed from here
 DROP AGGREGATE IF EXISTS topology.TopoElementArray_agg(topology.TopoElement);
+--
+-- Availability: 2.0.0
+--
 CREATE AGGREGATE topology.TopoElementArray_agg(
 	sfunc = topology.TopoElementArray_append,
 	basetype = topology.TopoElement,

commit 78c3fb2c8cddbb0db32bee61f1c668899eeee98e
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Feb 21 09:53:55 2023 +0100

    Add availbility info for TopoGeometry type

diff --git a/topology/topology.sql.in b/topology/topology.sql.in
index dd7932e29..777dc4098 100644
--- a/topology/topology.sql.in
+++ b/topology/topology.sql.in
@@ -324,6 +324,8 @@ ON topology.layer FOR EACH ROW EXECUTE PROCEDURE topology.LayerTrigger();
 --
 -- TopoGeometry type
 --
+-- Availability: 1.1.0
+--
 CREATE TYPE topology.TopoGeometry AS (
   topology_id integer,
   layer_id integer,

commit 5d41fa2637e1151838bb120f24b4ad29f583b148
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Feb 21 09:53:33 2023 +0100

    Add INSTALL VERSION info in topology.sql (for upgrade script handling)

diff --git a/topology/topology.sql.in b/topology/topology.sql.in
index 1160c58fe..dd7932e29 100644
--- a/topology/topology.sql.in
+++ b/topology/topology.sql.in
@@ -190,6 +190,8 @@
 
 #include "sqldefines.h"
 
+-- INSTALL VERSION: POSTGIS_LIB_VERSION
+
 CREATE SCHEMA topology;
 COMMENT ON SCHEMA topology IS 'PostGIS Topology schema';
 

commit caf3d6f2890fc04a53bf0576e0e6afee2f9de516
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Feb 21 09:52:38 2023 +0100

    Support schema qualified types in create_upgrade.pl

diff --git a/utils/create_upgrade.pl b/utils/create_upgrade.pl
index d6c5225d0..381969339 100755
--- a/utils/create_upgrade.pl
+++ b/utils/create_upgrade.pl
@@ -235,7 +235,7 @@ EOF
         print $def;
     }
 
-    if (/^create type (\w+)/i)
+    if (/^create type ([\w.]+)/i)
     {
         my $newtype = $1;
         my $def .= $_;

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

Summary of changes:
 topology/Makefile.in                            | 10 +++++-----
 topology/sql/manage/ValidateTopology.sql.in     |  2 ++
 topology/sql/topoelement/topoelement_agg.sql.in |  5 ++++-
 topology/topology.sql.in                        |  4 ++++
 utils/create_upgrade.pl                         |  2 +-
 5 files changed, 16 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
PostGIS