From: Regina Obe <lr@pcorp.us>
Date: Sun, 19 May 2013 19:01:20 +0000 (+0000)
Subject: #2185: bah still crashes sometimes on 9.2 -- better just remove teh immutable entirel... 
X-Git-Tag: 2.1.0beta3~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b423cff85375c2ec611ecfc4787a82f009f7898e;p=postgis

#2185: bah still crashes sometimes on 9.2 -- better just remove teh immutable entirely fromt hese functions.  No one should be suing these anyway since they are deprecated

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

diff --git a/postgis/geography.sql.in b/postgis/geography.sql.in
index 78ce1f0c4..a02dbbeb6 100644
--- a/postgis/geography.sql.in
+++ b/postgis/geography.sql.in
@@ -105,10 +105,12 @@ CREATE OR REPLACE FUNCTION ST_AsText(geography)
 	LANGUAGE 'c' IMMUTABLE STRICT;
 	
 -- Availability: 1.5.0 - this is just a hack to prevent unknown from causing ambiguous name because of geography
+-- Note: removing immutable because it crashes Windows EDB 9.2x64 bit 
+-- because of some sort of shared memory corruption it triggers on error
 CREATE OR REPLACE FUNCTION ST_AsText(text)
 	RETURNS text AS
 	$$ SELECT ST_AsText($1::geometry);  $$
-	LANGUAGE 'sql' IMMUTABLE STRICT COST 1;
+	LANGUAGE 'sql' STRICT COST 1;
 
 -- Availability: 1.5.0
 CREATE OR REPLACE FUNCTION ST_GeographyFromText(text)
@@ -420,10 +422,12 @@ CREATE OR REPLACE FUNCTION ST_AsKML(geog geography, maxdecimaldigits int4 DEFAUL
 
 -- Availability: 1.5.0 - this is just a hack to prevent unknown from causing ambiguous name because of geography
 -- Deprecated 2.0.0
+-- Note: removing immutable because it crashes Windows EDB 9.2x64 bit 
+-- because of some sort of shared memory corruption it triggers on error
 CREATE OR REPLACE FUNCTION ST_AsKML(text)
 	RETURNS text AS
 	$$ SELECT _ST_AsKML(2, $1::geometry, 15, null);  $$
-	LANGUAGE 'sql' IMMUTABLE STRICT COST 1;
+	LANGUAGE 'sql' STRICT COST 1;
 
 -- ST_AsKML(version, geography, precision, prefix)
 -- Availability: 2.0.0 nprefix added
@@ -444,10 +448,12 @@ CREATE OR REPLACE FUNCTION _ST_AsGeoJson(int4, geography, int4, int4)
 
 -- Availability: 1.5.0 - this is just a hack to prevent unknown from causing ambiguous name because of geography
 -- Deprecated in 2.0.0
+-- Note: removing immutable because it crashes Windows EDB 9.2x64 bit 
+-- because of some sort of shared memory corruption it triggers on error
 CREATE OR REPLACE FUNCTION ST_AsGeoJson(text)
 	RETURNS text AS
 	$$ SELECT _ST_AsGeoJson(1, $1::geometry,15,0);  $$
-	LANGUAGE 'sql' IMMUTABLE STRICT COST 1;
+	LANGUAGE 'sql' STRICT COST 1;
 
 -- ST_AsGeoJson(geography, precision, options) / version=1
 -- Changed: 2.0.0 to use default args and named args
@@ -524,10 +530,12 @@ CREATE OR REPLACE FUNCTION ST_DWithin(geography, geography, float8)
 	LANGUAGE 'sql' IMMUTABLE;
 
 -- Availability: 1.5.0 - this is just a hack to prevent unknown from causing ambiguous name because of geography
+-- Note: removing immutable because it crashes Windows EDB 9.2x64 bit 
+-- because of some sort of shared memory corruption it triggers on error
 CREATE OR REPLACE FUNCTION ST_DWithin(text, text, float8)
 	RETURNS boolean AS
 	$$ SELECT ST_DWithin($1::geometry, $2::geometry, $3);  $$
-	LANGUAGE 'sql' IMMUTABLE COST 1;
+	LANGUAGE 'sql' COST 1;
 
 
 -- ---------- ---------- ---------- ---------- ---------- ---------- ----------
@@ -592,10 +600,12 @@ CREATE OR REPLACE FUNCTION ST_Area(geog geography, use_spheroid boolean DEFAULT
 	COST 100;
 
 -- Availability: 1.5.0 - this is just a hack to prevent unknown from causing ambiguous name because of geography
+-- Note: removing immutable because it crashes Windows EDB 9.2x64 bit 
+-- because of some sort of shared memory corruption it triggers on error
 CREATE OR REPLACE FUNCTION ST_Area(text)
 	RETURNS float8 AS
 	$$ SELECT ST_Area($1::geometry);  $$
-	LANGUAGE 'sql' IMMUTABLE STRICT COST 1;
+	LANGUAGE 'sql' STRICT COST 1;
 
 -- Availability: 1.5.0
 CREATE OR REPLACE FUNCTION ST_Length(geog geography, use_spheroid boolean DEFAULT true)
@@ -605,10 +615,12 @@ CREATE OR REPLACE FUNCTION ST_Length(geog geography, use_spheroid boolean DEFAUL
 	COST 100;
 
 -- Availability: 1.5.0 - this is just a hack to prevent unknown from causing ambiguous name because of geography
+-- Note: removing immutable because it crashes Windows EDB 9.2x64 bit 
+-- because of some sort of shared memory corruption it triggers on error
 CREATE OR REPLACE FUNCTION ST_Length(text)
 	RETURNS float8 AS
 	$$ SELECT ST_Length($1::geometry);  $$
-	LANGUAGE 'sql' IMMUTABLE STRICT COST 1;
+	LANGUAGE 'sql' STRICT COST 1;
 
 -- Availability: 2.0.0
 CREATE OR REPLACE FUNCTION ST_Project(geog geography, distance float8, azimuth float8)
@@ -656,7 +668,7 @@ CREATE OR REPLACE FUNCTION ST_Covers(geography, geography)
 CREATE OR REPLACE FUNCTION ST_Covers(text, text)
 	RETURNS boolean AS
 	$$ SELECT ST_Covers($1::geometry, $2::geometry);  $$
-	LANGUAGE 'sql' IMMUTABLE COST 1;
+	LANGUAGE 'sql';
 
 -- Only implemented for polygon-over-point
 -- Availability: 1.5.0
@@ -669,7 +681,7 @@ CREATE OR REPLACE FUNCTION ST_CoveredBy(geography, geography)
 CREATE OR REPLACE FUNCTION ST_CoveredBy(text, text)
 	RETURNS boolean AS
 	$$ SELECT ST_CoveredBy($1::geometry, $2::geometry);  $$
-	LANGUAGE 'sql' IMMUTABLE COST 1;
+	LANGUAGE 'sql' ;
 
 -- Availability: 2.1.0
 CREATE OR REPLACE FUNCTION ST_Segmentize(geog geography, max_segment_length float8)
@@ -688,7 +700,7 @@ CREATE OR REPLACE FUNCTION ST_Intersects(geography, geography)
 CREATE OR REPLACE FUNCTION ST_Intersects(text, text)
 	RETURNS boolean AS
 	$$ SELECT ST_Intersects($1::geometry, $2::geometry);  $$
-	LANGUAGE 'sql' IMMUTABLE COST 1;
+	LANGUAGE 'sql' ;
 
 -- Availability: 1.5.0
 CREATE OR REPLACE FUNCTION _ST_BestSRID(geography, geography)