[postgis-commits] svn - r3529 - trunk/lwgeom

[postgis-commits at postgis.refractions.net]

Author: mcayland
Date: 2009-01-15 07:10:21 -0800 (Thu, 15 Jan 2009)
New Revision: 3529

Modified:
   trunk/lwgeom/lwgeom_functions_basic.c
   trunk/lwgeom/lwpostgis.sql.in.c
   trunk/lwgeom/sqldefines.h.in
Log:
Fix the output of "SELECT postgis_full_version()" on trunk by ensuring that USE_STATS is present, and correctly generating the POSTGIS_SCRIPTS_VERSION variable so that installations of trunk don't keep thinking that they need a scripts upgrade.


Modified: trunk/lwgeom/lwgeom_functions_basic.c
===================================================================
--- trunk/lwgeom/lwgeom_functions_basic.c	2009-01-14 23:20:41 UTC (rev 3528)
+++ trunk/lwgeom/lwgeom_functions_basic.c	2009-01-15 15:10:21 UTC (rev 3529)
@@ -173,11 +173,7 @@
 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);

Modified: trunk/lwgeom/lwpostgis.sql.in.c
===================================================================
--- trunk/lwgeom/lwpostgis.sql.in.c	2009-01-14 23:20:41 UTC (rev 3528)
+++ trunk/lwgeom/lwpostgis.sql.in.c	2009-01-15 15:10:21 UTC (rev 3529)
@@ -3465,7 +3465,7 @@
 -- 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

Modified: trunk/lwgeom/sqldefines.h.in
===================================================================
--- trunk/lwgeom/sqldefines.h.in	2009-01-14 23:20:41 UTC (rev 3528)
+++ trunk/lwgeom/sqldefines.h.in	2009-01-15 15:10:21 UTC (rev 3529)
@@ -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