From: Bborie Park <bkpark at ucdavis.edu>
Date: Sat, 9 Nov 2013 02:54:31 +0000 (+0000)
Subject: Rename GUC postgis.gdal.datapath to postgis.gdal_datapath. Ticket #2540
X-Git-Tag: 2.2.0rc1~1296
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0284eaab2b96c346b75734e6c05a3f9aaf549843;p=postgis

Rename GUC postgis.gdal.datapath to postgis.gdal_datapath. Ticket #2540

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

diff --git a/NEWS b/NEWS
index 02098173f..6394b154f 100644
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,7 @@ PostGIS 2.2.0
   - #2512, Support for foreign tables and materialized views in
            raster_columns and raster_overviews
   - #2532, Add missing raster/geometry commutator operators
+  - #2540, Change GUC name for GDAL_DATA to postgis.gdal_datapath
 
  * Code refactoring *
 
diff --git a/raster/rt_pg/rtpostgis.c b/raster/rt_pg/rtpostgis.c
index 30f7b1a59..a074e9f0c 100644
--- a/raster/rt_pg/rtpostgis.c
+++ b/raster/rt_pg/rtpostgis.c
@@ -174,7 +174,7 @@ _PG_init(void) {
 
 	/* Define custom GUC variables. */
 	DefineCustomStringVariable(
-		"postgis.gdal.datapath", /* name */
+		"postgis.gdal_datapath", /* name */
 		"Path to GDAL data files.", /* short_desc */
 		"Physical path to directory containing GDAL data files (sets the GDAL_DATA config option).", /* long_desc */
 		&gdaldatapath, /* valueAddr */
diff --git a/raster/test/regress/check_gdal.sql b/raster/test/regress/check_gdal.sql
index d01688fc6..0e9ab3d94 100644
--- a/raster/test/regress/check_gdal.sql
+++ b/raster/test/regress/check_gdal.sql
@@ -4,14 +4,14 @@ SELECT
 			THEN false
 		ELSE NULL
 	END;
-SET postgis.gdal.datapath = '';
+SET postgis.gdal_datapath = '';
 SELECT 
 	CASE
 		WHEN strpos(postgis_gdal_version(), 'GDAL_DATA') <> 0
 			THEN NULL
 		ELSE TRUE
 	END;
-SET postgis.gdal.datapath = default;
+SET postgis.gdal_datapath = default;
 SELECT 
 	CASE
 		WHEN strpos(postgis_gdal_version(), 'GDAL_DATA') <> 0