[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0alpha1-93-g95ebf0438
git at osgeo.org
git at osgeo.org
Tue Jun 21 05:42:19 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 95ebf04389aa77c3a0d47f8f7f92b58ee0496842 (commit)
from 8003f013ad9e9cfb57d46f65f9af9cf5b7e0e969 (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 95ebf04389aa77c3a0d47f8f7f92b58ee0496842
Author: Sandro Santilli <strk at kbt.io>
Date: Tue Jun 21 12:46:15 2022 +0200
Rename postgis_proc_upgrade.pl to create_upgrade.pl, drop unused argument
diff --git a/.editorconfig b/.editorconfig
index 493a499d5..8c724db4d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -25,8 +25,8 @@ indent_style = tab
indent_style = space
indent_size = 2
-# Exception: utils/postgis_proc_upgrade.pl uses 4-spaces indent
-[utils/postgis_proc_upgrade.pl]
+# Exception: utils/create_upgrade.pl uses 4-spaces indent
+[utils/create_upgrade.pl]
indent_style = space
indent_size = 4
diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index 8dd9af610..00448571a 100644
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -130,8 +130,8 @@ sql/postgis_upgrade_for_extension.sql: ../../postgis/postgis_before_upgrade.sql
# WARNING: we should make sure these are not internal to function bodies
cat $^ | $(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' > $@
-sql/postgis_upgrade_for_extension.sql.in: sql/postgis_for_extension.sql ../../utils/postgis_proc_upgrade.pl | sql
- $(PERL) @top_srcdir@/utils/postgis_proc_upgrade.pl $< UNUSED > $@
+sql/postgis_upgrade_for_extension.sql.in: sql/postgis_for_extension.sql ../../utils/create_upgrade.pl | sql
+ $(PERL) @top_srcdir@/utils/create_upgrade.pl $< > $@
sql/postgis_for_extension.sql: ../../postgis/postgis.sql.in ../../postgis_revision.h | sql
$(SQLPP) -I at builddir@/../../postgis $< | grep -v '^#' | \
diff --git a/extensions/postgis_raster/Makefile.in b/extensions/postgis_raster/Makefile.in
index 1cb2d2ddb..13f1966cc 100644
--- a/extensions/postgis_raster/Makefile.in
+++ b/extensions/postgis_raster/Makefile.in
@@ -106,8 +106,8 @@ sql/rtpostgis_upgrade_for_extension.sql: ../../raster/rt_pg/rtpostgis_upgrade_cl
echo 'COMMIT;' >> $@
-sql/rtpostgis_upgrade_for_extension.sql.in: sql/rtpostgis_for_extension.sql ../../utils/postgis_proc_upgrade.pl | sql
- $(PERL) @top_srcdir@/utils/postgis_proc_upgrade.pl $< UNUSED > $@
+sql/rtpostgis_upgrade_for_extension.sql.in: sql/rtpostgis_for_extension.sql ../../utils/create_upgrade.pl | sql
+ $(PERL) @top_srcdir@/utils/create_upgrade.pl $< > $@
../../doc/raster_comments.sql:
diff --git a/postgis/Makefile.in b/postgis/Makefile.in
index 5415a538f..4e74dbd9f 100644
--- a/postgis/Makefile.in
+++ b/postgis/Makefile.in
@@ -240,8 +240,8 @@ endif
$(PERL) -lpe "s'MODULE_PATHNAME'\$(MODULEPATH)'g;s'@extschema@\.''g" > $@
#this is redundant but trying to fold in with extension just hangs
-postgis_upgrade.sql.in: postgis.sql ../utils/postgis_proc_upgrade.pl
- $(PERL) @top_srcdir@/utils/postgis_proc_upgrade.pl $< UNUSED > $@
+postgis_upgrade.sql.in: postgis.sql ../utils/create_upgrade.pl
+ $(PERL) @top_srcdir@/utils/create_upgrade.pl $< > $@
postgis_upgrade.sql: postgis_before_upgrade.sql postgis_upgrade.sql.in postgis_after_upgrade.sql
diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in
index 49cfcdbdd..5dd1f4602 100644
--- a/postgis/postgis.sql.in
+++ b/postgis/postgis.sql.in
@@ -2902,9 +2902,9 @@ CREATE OR REPLACE FUNCTION postgis_wagyu_version() RETURNS text
--
-- IMPORTANT:
--- Starting at 1.1.0 this function is used by postgis_proc_upgrade.pl
+-- Starting at 1.1.0 this function is used by create_upgrade.pl
-- to extract version of postgis being installed.
--- Do not modify this w/out also changing postgis_proc_upgrade.pl
+-- Do not modify this w/out also changing create_upgrade.pl
--
CREATE OR REPLACE FUNCTION postgis_scripts_installed() RETURNS text
AS _POSTGIS_SQL_SELECT_POSTGIS_SCRIPTS_VERSION
diff --git a/raster/rt_pg/Makefile.in b/raster/rt_pg/Makefile.in
index be8805c45..ae70a859e 100644
--- a/raster/rt_pg/Makefile.in
+++ b/raster/rt_pg/Makefile.in
@@ -146,8 +146,8 @@ $(OBJS): ../../liblwgeom/.libs/liblwgeom.a ../rt_core/librtcore.a ../../libpgcom
$(SQL_OBJS): ../../postgis/sqldefines.h ../../postgis_revision.h
#this is redundant but trying to fold in with the other just hangs
-rtpostgis_upgrade.sql.in: rtpostgis.sql ../../utils/postgis_proc_upgrade.pl
- $(PERL) @top_srcdir@/utils/postgis_proc_upgrade.pl $< UNUSED > $@
+rtpostgis_upgrade.sql.in: rtpostgis.sql ../../utils/create_upgrade.pl
+ $(PERL) @top_srcdir@/utils/create_upgrade.pl $< > $@
rtpostgis_upgrade.sql: rtpostgis_upgrade_cleanup.sql rtpostgis_upgrade.sql.in rtpostgis_drop.sql
echo 'BEGIN;' > $@
diff --git a/sfcgal/Makefile.in b/sfcgal/Makefile.in
index 0c8cec8a4..9504ead5b 100644
--- a/sfcgal/Makefile.in
+++ b/sfcgal/Makefile.in
@@ -125,8 +125,8 @@ $(SQL_OBJS): ../postgis_config.h ../postgis_revision.h
$(SQLPP) -I at top_builddir@/postgis $< | grep -v '^#' | \
$(PERL) -lpe "s'MODULE_PATHNAME'\$(MODULEPATH)'g;s'@extschema@\.''g" > $@
-sfcgal_upgrade.sql.in: sfcgal.sql ../utils/postgis_proc_upgrade.pl
- $(PERL) @top_srcdir@/utils/postgis_proc_upgrade.pl $< UNUSED > $@
+sfcgal_upgrade.sql.in: sfcgal.sql ../utils/create_upgrade.pl
+ $(PERL) @top_srcdir@/utils/create_upgrade.pl $< > $@
sfcgal_upgrade.sql: sfcgal_before_upgrade.sql sfcgal_upgrade.sql.in sfcgal_after_upgrade.sql
echo "BEGIN;" > $@
diff --git a/topology/Makefile.in b/topology/Makefile.in
index 03372e862..041855dcb 100644
--- a/topology/Makefile.in
+++ b/topology/Makefile.in
@@ -107,7 +107,7 @@ endif
#Generate upgrade script by stripping things that can't be reinstalled
#e.g. don't bother with tables, types, triggers, and domains
-# TODO: use postgis_proc_upgrade.pl
+# 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;' $< > $@
diff --git a/utils/Makefile.in b/utils/Makefile.in
index 650d83482..4dc63805a 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -36,7 +36,7 @@ SCRIPTS_built = postgis_restore.pl
SCRIPTS = \
create_undef.pl \
repo_revision.pl \
- postgis_proc_upgrade.pl \
+ create_upgrade.pl \
profile_intersects.pl \
test_estimation.pl \
test_joinestimation.pl
diff --git a/utils/README b/utils/README
index 255db0032..c8b4cc165 100644
--- a/utils/README
+++ b/utils/README
@@ -5,7 +5,7 @@ postgis_restore.pl
restore a spatial database dump to a (possibly updated)
new spatial database.
-postgis_proc_upgrade.pl
+create_upgrade.pl
Create a postgis procedures upgrade script. Will warn
if operations is not cleanly possible due to nature
of changes in postgis procedures.
diff --git a/utils/postgis_proc_upgrade.pl b/utils/create_upgrade.pl
similarity index 99%
rename from utils/postgis_proc_upgrade.pl
rename to utils/create_upgrade.pl
index dff97bc79..08bf455bd 100755
--- a/utils/postgis_proc_upgrade.pl
+++ b/utils/create_upgrade.pl
@@ -84,7 +84,7 @@ sub parse_missing
#
($#ARGV == 0)
||die
-"Usage: perl postgis_proc_upgrade.pl <postgis.sql> <version_from> [<schema>]\nCreates a new SQL script to upgrade all of the PostGIS functions.\n"
+"Usage: perl create_upgrade.pl <create_script.sql> [<schema>]\nCreates a new SQL script to upgrade all of the PostGIS functions.\n"
if ( @ARGV < 1 || @ARGV > 3 );
my $sql_file = $ARGV[0];
@@ -92,10 +92,8 @@ my $module = 'postgis';
my $soname = '';
my $version_to = "";
my $version_to_num = 0;
-my $version_from = $ARGV[1];
-my $version_from_num = 0;
my $schema = "";
-$schema = $ARGV[2] if @ARGV > 2;
+$schema = $ARGV[1] if @ARGV > 1;
my @renamed_deprecated_functions = ();
-----------------------------------------------------------------------
Summary of changes:
.editorconfig | 4 ++--
extensions/postgis/Makefile.in | 4 ++--
extensions/postgis_raster/Makefile.in | 4 ++--
postgis/Makefile.in | 4 ++--
postgis/postgis.sql.in | 4 ++--
raster/rt_pg/Makefile.in | 4 ++--
sfcgal/Makefile.in | 4 ++--
topology/Makefile.in | 2 +-
utils/Makefile.in | 2 +-
utils/README | 2 +-
utils/{postgis_proc_upgrade.pl => create_upgrade.pl} | 6 ++----
11 files changed, 19 insertions(+), 21 deletions(-)
rename utils/{postgis_proc_upgrade.pl => create_upgrade.pl} (99%)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list