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 02098173f6f30ee05ab502bb50b5d4d51c6b4a26..6394b154f5a1ba3fe4d8f7fdf7af65bc78761e04 100644 (file)
--- 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 30f7b1a59a0abc843c04ec1c950ea5cd139528a6..a074e9f0c7a6e0f0c30512cedefac42ae2dfd43a 100644 (file)
--- 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 d01688fc696c9f7e16632024639fefe745e8186c..0e9ab3d94f04e56ae7f7621ed3a9664784ba2187 100644 (file)
--- 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