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

[postgis-commits at postgis.refractions.net]

Author: mcayland
Date: 2007-06-08 03:28:52 -0700 (Fri, 08 Jun 2007)
New Revision: 2622

Modified:
   trunk/lwgeom/long_xact.sql.in
   trunk/lwgeom/lwgeom_gml.c
   trunk/lwgeom/lwgeom_kml.c
   trunk/lwgeom/lwpostgis.sql.in
Log:
Applied Michael Fuhr's patch to use explicit text casts where required. Required for PostgreSQL 8.3 where many of the implicit casts to text have been removed.

Modified: trunk/lwgeom/long_xact.sql.in
===================================================================
--- trunk/lwgeom/long_xact.sql.in	2007-06-07 17:02:11 UTC (rev 2621)
+++ trunk/lwgeom/long_xact.sql.in	2007-06-08 10:28:52 UTC (rev 2622)
@@ -89,8 +89,8 @@
 	END LOOP;
 
 	EXECUTE ''INSERT INTO authorization_table VALUES (''||
-		quote_literal(mytoid)||'',''||quote_literal(myrid)||
-		'',''||quote_literal(expires)||
+		quote_literal(mytoid::text)||'',''||quote_literal(myrid)||
+		'',''||quote_literal(expires::text)||
 		'',''||quote_literal(authid) ||'')'';
 
 	GET DIAGNOSTICS ret = ROW_COUNT;

Modified: trunk/lwgeom/lwgeom_gml.c
===================================================================
--- trunk/lwgeom/lwgeom_gml.c	2007-06-07 17:02:11 UTC (rev 2621)
+++ trunk/lwgeom/lwgeom_gml.c	2007-06-08 10:28:52 UTC (rev 2622)
@@ -460,7 +460,7 @@
 	}
 
 	/* write query */
-	sprintf(query, "SELECT textcat(auth_name, textcat(':', auth_srid)) \
+	sprintf(query, "SELECT textcat(auth_name, textcat(':', auth_srid::text)) \
 		FROM spatial_ref_sys WHERE srid = '%d'", SRID);
 #ifdef PGIS_DEBUG
 	elog(NOTICE, "Query: %s", query);

Modified: trunk/lwgeom/lwgeom_kml.c
===================================================================
--- trunk/lwgeom/lwgeom_kml.c	2007-06-07 17:02:11 UTC (rev 2621)
+++ trunk/lwgeom/lwgeom_kml.c	2007-06-08 10:28:52 UTC (rev 2622)
@@ -445,7 +445,7 @@
 	}
 
 	/* write query */
-	sprintf(query, "SELECT textcat(auth_name, textcat(':', auth_srid)) \
+	sprintf(query, "SELECT textcat(auth_name, textcat(':', auth_srid::text)) \
 		FROM spatial_ref_sys WHERE srid = '%d'", SRID);
 #ifdef PGIS_DEBUG
 	elog(NOTICE, "Query: %s", query);

Modified: trunk/lwgeom/lwpostgis.sql.in
===================================================================
--- trunk/lwgeom/lwpostgis.sql.in	2007-06-07 17:02:11 UTC (rev 2621)
+++ trunk/lwgeom/lwpostgis.sql.in	2007-06-08 10:28:52 UTC (rev 2622)
@@ -2996,10 +2996,10 @@
 		stale = 0;
 	END IF;
 
-        RETURN ''probed:''||probed||
-		'' inserted:''||inserted||
-		'' conflicts:''||probed-inserted||
-		'' stale:''||stale;
+        RETURN ''probed:''||probed::text||
+		'' inserted:''||inserted::text||
+		'' conflicts:''||(probed-inserted)::text||
+		'' stale:''||stale::text;
 END
 
 '
@@ -3150,7 +3150,7 @@
 #endif
 		quote_literal(table_name) || '','' ||
 		quote_literal(column_name) || '','' ||
-		new_dim || '','' || new_srid || '','' ||
+		new_dim::text || '','' || new_srid::text || '','' ||
 		quote_literal(new_type) || '')'';
 
 	-- Add table checks
@@ -3164,7 +3164,7 @@
 		|| '' ADD CONSTRAINT '' 
 		|| quote_ident(''enforce_srid_'' || column_name)
 		|| '' CHECK (SRID('' || quote_ident(column_name) ||
-		'') = '' || new_srid || '')'' ;
+		'') = '' || new_srid::text || '')'' ;
 
 	EXECUTE ''ALTER TABLE '' || 
 #if USE_VERSION >= 73
@@ -3175,7 +3175,7 @@
 		|| '' ADD CONSTRAINT ''
 		|| quote_ident(''enforce_dims_'' || column_name)
 		|| '' CHECK (ndims('' || quote_ident(column_name) ||
-		'') = '' || new_dim || '')'' ;
+		'') = '' || new_dim::text || '')'' ;
 
 	IF (not(new_type = ''GEOMETRY'')) THEN
 		EXECUTE ''ALTER TABLE '' || 
@@ -3197,9 +3197,9 @@
 		real_schema || ''.'' || 
 #endif
 		table_name || ''.'' || column_name ||
-		'' SRID:'' || new_srid ||
+		'' SRID:'' || new_srid::text ||
 		'' TYPE:'' || new_type || 
-		'' DIMS:'' || new_dim || chr(10) || '' ''; 
+		'' DIMS:'' || new_dim::text || chr(10) || '' ''; 
 END;
 '
 LANGUAGE 'plpgsql' _VOLATILE_STRICT; -- WITH (isstrict);
@@ -3503,7 +3503,7 @@
 	END IF;
 
 	-- Update ref from geometry_columns table
-	EXECUTE ''UPDATE geometry_columns SET SRID = '' || new_srid || 
+	EXECUTE ''UPDATE geometry_columns SET SRID = '' || new_srid::text || 
 		'' where f_table_schema = '' ||
 		quote_literal(real_schema) || '' and f_table_name = '' ||
 		quote_literal(table_name)  || '' and f_geometry_column = '' ||
@@ -3530,7 +3530,7 @@
 #endif
 		'' SET '' || quote_ident(column_name) ||
 		'' = setSRID('' || quote_ident(column_name) ||
-		'', '' || new_srid || '')'';
+		'', '' || new_srid::text || '')'';
 
 	-- Reset enforce_srid constraint
 #if USE_VERSION < 73
@@ -3541,9 +3541,9 @@
 #endif
 		'' ADD constraint '' || quote_ident(cname) ||
 		'' CHECK (srid('' || quote_ident(column_name) ||
-		'') = '' || new_srid || '')'';
+		'') = '' || new_srid::text || '')'';
 
-	RETURN real_schema || ''.'' || table_name || ''.'' || column_name ||'' SRID changed to '' || new_srid;
+	RETURN real_schema || ''.'' || table_name || ''.'' || column_name ||'' SRID changed to '' || new_srid::text;
 	
 END;
 '
@@ -4065,7 +4065,7 @@
 CREATE CAST (chip AS geometry) WITH FUNCTION ST_geometry(chip) AS IMPLICIT;
 CREATE CAST (bytea AS geometry) WITH FUNCTION ST_geometry(bytea) AS IMPLICIT;
 CREATE CAST (geometry AS bytea) WITH FUNCTION ST_bytea(geometry) AS IMPLICIT;
-CREATE CAST (bool AS text) WITH FUNCTION ST_text(bool) AS IMPLICIT;
+-- CREATE CAST (bool AS text) WITH FUNCTION ST_text(bool) AS IMPLICIT;
 #endif
 
 ---------------------------------------------------------------