Added raster upgrade path from 2.0 to 2.1. Ticket #2348

git-svn-id: http://svn.osgeo.org/postgis/trunk@11523 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/.gitignore b/.gitignore
index cae7ae4a6ee92357ea0a6632f9fee8a857df6d39..14c39ef3f27bda3b5da22888d6e96d60a7c9bab1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -81,12 +81,10 @@ raster/Makefile
 raster/raster_config.h
 raster/rt_core/Makefile
 raster/rt_pg/Makefile
+raster/rt_pg/rtpostgis.sql
 raster/rt_pg/rtpostgis_drop.sql
 raster/rt_pg/rtpostgis_legacy.sql
-raster/rt_pg/rtpostgis.sql
-raster/rt_pg/rtpostgis_upgrade_20_minor.sql
-raster/rt_pg/rtpostgis_upgrade_cleanup.sql
-raster/rt_pg/rtpostgis_upgrade.sql
+raster/rt_pg/rtpostgis_upgrade*.sql
 raster/rt_pg/uninstall_rtpostgis.sql
 raster/scripts/Makefile
 raster/scripts/python/Makefile

diff --git a/NEWS b/NEWS
index 2bf04ac9b1c17083388f7dbab56224789c7d7230..e33b75328c32182c4214e3aa2684d319cd612d17 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -201,6 +201,7 @@ PostGIS 2.1.0
   - #2271, Prevent parallel make of raster
   - #2282, Fix call to undefined function nd_stats_to_grid() in debug mode
   - #2309, Remove confusing INFO message when trying to get SRS info
+  - #2348, Provide raster upgrade path for 2.0 to 2.1
 
 PostGIS 2.0.3
 2013/03/01

diff --git a/raster/rt_core/.svnignore b/raster/rt_core/.svnignore
index 03f848ad51b099da0003e27b45d968707d61ccac..f3c7a7c5da68804a1bdf391127ba34aed33c3cca 100644 (file)
--- a/raster/rt_core/.svnignore
+++ b/raster/rt_core/.svnignore
@@ -1,3 +1 @@
 Makefile
-testapi
-testwkb

diff --git a/raster/rt_pg/.svnignore b/raster/rt_pg/.svnignore
index 2d7bbf76e28e56e9f68e90ff452e537354d64dbb..656647987bfa012387f424577e903836f8fed80b 100644 (file)
--- a/raster/rt_pg/.svnignore
+++ b/raster/rt_pg/.svnignore
@@ -1,12 +1,6 @@
 Makefile
 rtpostgis.sql
-rtpostgis.sql.in
 rtpostgis_drop.sql
-rtpostgis_drop.sql.in
-rtpostgis_upgrade.sql
-rtpostgis_upgrade_20_minor.sql
-rtpostgis_upgrade_cleanup.sql
-rtpostgis_upgrade_cleanup.sql.in
+rtpostgis_upgrade*.sql
 uninstall_rtpostgis.sql
 rtpostgis_legacy.sql
-rtpostgis_legacy.sql.in

diff --git a/raster/rt_pg/Makefile.in b/raster/rt_pg/Makefile.in
index 725ddcd3e8e4798e706e119ee7fa75ea07fc9320..fcc77930bfae7bb4f3aa20408b2cb790f9c7c4df 100644 (file)
--- a/raster/rt_pg/Makefile.in
+++ b/raster/rt_pg/Makefile.in
@@ -14,7 +14,7 @@ MODULE_big=rtpostgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@
 MODULEDIR=contrib/postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@
 
 # Files to be copied to the contrib/ directory
-DATA_built=rtpostgis.sql rtpostgis_upgrade_20_minor.sql uninstall_rtpostgis.sql rtpostgis_legacy.sql
+DATA_built=rtpostgis.sql rtpostgis_upgrade_20_21.sql rtpostgis_upgrade_21_minor.sql uninstall_rtpostgis.sql rtpostgis_legacy.sql
 DATA=
 
 # SQL preprocessor
@@ -103,7 +103,11 @@ $(SQL_OBJS): ../../postgis/sqldefines.h ../../postgis_svn_revision.h
 rtpostgis_upgrade.sql: rtpostgis.sql
        $(PERL) -0777 -ne 's/^(CREATE|ALTER) (CAST|OPERATOR|TYPE|TABLE|SCHEMA|DOMAIN|TRIGGER).*?;//msg;print;' $< > $@
 
-rtpostgis_upgrade_20_minor.sql: rtpostgis_upgrade_cleanup.sql rtpostgis_drop.sql rtpostgis_upgrade.sql 
+rtpostgis_upgrade_20_21.sql: rtpostgis_upgrade_cleanup.sql rtpostgis_drop.sql rtpostgis_upgrade.sql 
+       cat $^ > $@
+
+# same as 20_21 until 2.1.0 is released
+rtpostgis_upgrade_21_minor.sql: rtpostgis_upgrade_cleanup.sql rtpostgis_drop.sql rtpostgis_upgrade.sql 
        cat $^ > $@
 
 uninstall_rtpostgis.sql: rtpostgis.sql ../../utils/create_undef.pl