Fix the output of "SELECT postgis_full_version()" on trunk by ensuring that USE_STATS...

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

diff --git a/lwgeom/lwgeom_functions_basic.c b/lwgeom/lwgeom_functions_basic.c
index 98985bcf7a579737712dc07d4354878ffb8343cf..57550b1b879f8d99acae1e65efc18dbdffe1e181 100644 (file)
--- a/lwgeom/lwgeom_functions_basic.c
+++ b/lwgeom/lwgeom_functions_basic.c
@@ -173,11 +173,7 @@ Datum postgis_scripts_released(PG_FUNCTION_ARGS)
 PG_FUNCTION_INFO_V1(postgis_uses_stats);
 Datum postgis_uses_stats(PG_FUNCTION_ARGS)
 {
-#ifdef USE_STATS
        PG_RETURN_BOOL(TRUE);
-#else
-       PG_RETURN_BOOL(FALSE);
-#endif
 }
 
 PG_FUNCTION_INFO_V1(postgis_autocache_bbox);

diff --git a/lwgeom/lwpostgis.sql.in.c b/lwgeom/lwpostgis.sql.in.c
index 8cf00359300c05953aa7d9cf8c1655f06acefaef..f6c8aff71145ecc0ab571fb91e4de7fa56ccec9e 100644 (file)
--- a/lwgeom/lwpostgis.sql.in.c
+++ b/lwgeom/lwpostgis.sql.in.c
@@ -3465,7 +3465,7 @@ CREATEFUNCTION postgis_proj_version() RETURNS text
 -- Do not modify this w/out also changing postgis_proc_upgrade.pl
 --
 CREATEFUNCTION postgis_scripts_installed() RETURNS text
-        AS _POSTGIS_SQL_SELECT_POSTGIS_VERSION
+        AS _POSTGIS_SQL_SELECT_POSTGIS_SCRIPTS_VERSION 
         LANGUAGE 'sql' _IMMUTABLE;
 
 CREATEFUNCTION postgis_lib_version() RETURNS text

diff --git a/lwgeom/sqldefines.h.in b/lwgeom/sqldefines.h.in
index ea765e31521d6c0c90998d29274327740cc6bf1b..47eb6220a729dc8e14471e6dd27de63e49eaee44 100644 (file)
--- a/lwgeom/sqldefines.h.in
+++ b/lwgeom/sqldefines.h.in
@@ -15,6 +15,7 @@
  */
 #define _POSTGIS_SQL_SELECT_POSTGIS_VERSION 'SELECT ''@POSTGIS_VERSION@''::text AS version'
 #define _POSTGIS_SQL_SELECT_POSTGIS_BUILD_DATE 'SELECT ''@POSTGIS_BUILD_DATE@''::text AS version'
+#define _POSTGIS_SQL_SELECT_POSTGIS_SCRIPTS_VERSION 'SELECT ''@POSTGIS_SCRIPTS_VERSION@''::text AS version'
 
 #define CREATEFUNCTION CREATE OR REPLACE FUNCTION