From b2729fb999fb45e70bb83697b65ba184c75fb2c2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ra=C3=BAl=20Mar=C3=ADn=20Rodr=C3=ADguez?= Date: Wed, 12 Jun 2019 10:30:22 +0000 Subject: [PATCH] Rename update sql files postgis/postgis_drop_after.sql -> postgis/postgis_after_upgrade.sql postgis/postgis_drop_before.sql -> postgis/postgis_before_upgrade.sql Closes #4334 git-svn-id: http://svn.osgeo.org/postgis/trunk@17508 b70326c6-7e19-0410-871a-916f4a2858ee --- extensions/postgis/Makefile.in | 2 +- postgis/Makefile.in | 4 ++-- postgis/postgis.sql.in | 2 +- postgis/{postgis_drop_after.sql => postgis_after_upgrade.sql} | 0 .../{postgis_drop_before.sql => postgis_before_upgrade.sql} | 0 utils/Makefile.in | 4 ++-- 6 files changed, 6 insertions(+), 6 deletions(-) rename postgis/{postgis_drop_after.sql => postgis_after_upgrade.sql} (100%) rename postgis/{postgis_drop_before.sql => postgis_before_upgrade.sql} (100%) diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in index ad0dfb432..f942219ea 100644 --- a/extensions/postgis/Makefile.in +++ b/extensions/postgis/Makefile.in @@ -119,7 +119,7 @@ sql/spatial_ref_sys.sql: ../../spatial_ref_sys.sql | sql sql/spatial_ref_sys_config_dump.sql: ../../spatial_ref_sys.sql ../../utils/create_spatial_ref_sys_config_dump.pl | sql $(PERL) ../../utils/create_spatial_ref_sys_config_dump.pl $< > $@ -sql/postgis_upgrade_for_extension.sql: ../../postgis/postgis_drop_before.sql sql/postgis_upgrade_for_extension.sql.in ../../postgis/postgis_drop_after.sql | sql +sql/postgis_upgrade_for_extension.sql: ../../postgis/postgis_before_upgrade.sql sql/postgis_upgrade_for_extension.sql.in ../../postgis/postgis_after_upgrade.sql | sql #strip BEGIN/COMMIT since these are not allowed in extensions # WARNING: we should make sure these are not internal to function bodies cat $^ | $(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' > $@ diff --git a/postgis/Makefile.in b/postgis/Makefile.in index fe86ba273..e925dc38e 100644 --- a/postgis/Makefile.in +++ b/postgis/Makefile.in @@ -238,7 +238,7 @@ postgis_upgrade.sql.in: postgis.sql ../utils/postgis_proc_upgrade.pl postgis_proc_set_search_path.sql: postgis.sql ../utils/postgis_proc_set_search_path.pl $(PERL) ../utils/postgis_proc_set_search_path.pl $< UNUSED > $@ -postgis_upgrade.sql: postgis_drop_before.sql postgis_upgrade.sql.in postgis_drop_after.sql +postgis_upgrade.sql: postgis_before_upgrade.sql postgis_upgrade.sql.in postgis_after_upgrade.sql echo "BEGIN;" > $@ cat $^ >> $@ echo "COMMIT;" >> $@ @@ -246,7 +246,7 @@ postgis_upgrade.sql: postgis_drop_before.sql postgis_upgrade.sql.in postgis_drop sfcgal_upgrade.sql.in: sfcgal.sql ../utils/postgis_proc_upgrade.pl $(PERL) ../utils/postgis_proc_upgrade.pl $< UNUSED > $@ -sfcgal_upgrade.sql: sfcgal_upgrade.sql.in postgis_drop_after.sql +sfcgal_upgrade.sql: sfcgal_upgrade.sql.in postgis_after_upgrade.sql cat $^ > $@ # SQL objects are also dependent on postgis_config.h for PostgreSQL version diff --git a/postgis/postgis.sql.in b/postgis/postgis.sql.in index 00fed22f6..93cbf9c89 100644 --- a/postgis/postgis.sql.in +++ b/postgis/postgis.sql.in @@ -3877,7 +3877,7 @@ CREATE OR REPLACE FUNCTION ST_Union (geometry[]) -- Availability: 1.2.2 -- Changed but upgrader helper no touch: 2.4.0 marked parallel safe -- we don't want to force drop of this agg since its often used in views --- parallel handling dealt with in postgis_drop_after.sql +-- parallel handling dealt with in postgis_after_upgrade.sql -- Changed: 2.5.0 use 'internal' stype -- Changed: 3.0.0 transfn now converts to GEOS CREATE AGGREGATE ST_Union (geometry) ( diff --git a/postgis/postgis_drop_after.sql b/postgis/postgis_after_upgrade.sql similarity index 100% rename from postgis/postgis_drop_after.sql rename to postgis/postgis_after_upgrade.sql diff --git a/postgis/postgis_drop_before.sql b/postgis/postgis_before_upgrade.sql similarity index 100% rename from postgis/postgis_drop_before.sql rename to postgis/postgis_before_upgrade.sql diff --git a/utils/Makefile.in b/utils/Makefile.in index 5202b6cfa..b6c04594f 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in @@ -47,8 +47,8 @@ all: postgis_restore.pl DROP_FILES = \ ../raster/rt_pg/rtpostgis_upgrade_cleanup.sql.in \ ../raster/rt_pg/rtpostgis_drop.sql.in \ - ../postgis/postgis_drop_after.sql \ - ../postgis/postgis_drop_before.sql + ../postgis/postgis_after_upgrade.sql \ + ../postgis/postgis_before_upgrade.sql update-restore: tac postgis_restore.pl.in | sed '/^__END__/q' | grep -v '^__END__' \ -- 2.40.0