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

[postgis-commits at postgis.refractions.net]

Author: mcayland
Date: 2008-06-05 09:08:23 -0700 (Thu, 05 Jun 2008)
New Revision: 2807

Modified:
   trunk/lwgeom/lwpostgis.sql.in.c
Log:
Some more updates to lwpostgis.sql.in.c; correct a couple of missing conversions from OPAQUE_TYPE to internal (how on earth did regression tests pass with this still in place??), plus remove the UPDATE on pg_opclass to change the OID of the index storage type since we can do this by specifying a STORAGE clause instead.

Modified: trunk/lwgeom/lwpostgis.sql.in.c
===================================================================
--- trunk/lwgeom/lwpostgis.sql.in.c	2008-06-05 14:49:29 UTC (rev 2806)
+++ trunk/lwgeom/lwpostgis.sql.in.c	2008-06-05 16:08:23 UTC (rev 2807)
@@ -958,32 +958,32 @@
 	LANGUAGE 'C';
 
 CREATEFUNCTION LWGEOM_gist_compress(internal) 
-	RETURNS OPAQUE_TYPE 
+	RETURNS internal 
 	AS 'MODULE_PATHNAME','LWGEOM_gist_compress'
 	LANGUAGE 'C';
 
 CREATEFUNCTION LWGEOM_gist_penalty(internal,internal,internal) 
-	RETURNS OPAQUE_TYPE 
+	RETURNS internal 
 	AS 'MODULE_PATHNAME' ,'LWGEOM_gist_penalty'
 	LANGUAGE 'C';
 
 CREATEFUNCTION LWGEOM_gist_picksplit(internal, internal) 
-	RETURNS OPAQUE_TYPE 
+	RETURNS internal 
 	AS 'MODULE_PATHNAME' ,'LWGEOM_gist_picksplit'
 	LANGUAGE 'C';
 
 CREATEFUNCTION LWGEOM_gist_union(bytea, internal) 
-	RETURNS OPAQUE_TYPE 
+	RETURNS internal 
 	AS 'MODULE_PATHNAME' ,'LWGEOM_gist_union'
 	LANGUAGE 'C';
 
 CREATEFUNCTION LWGEOM_gist_same(box2d, box2d, internal) 
-	RETURNS OPAQUE_TYPE 
+	RETURNS internal 
 	AS 'MODULE_PATHNAME' ,'LWGEOM_gist_same'
 	LANGUAGE 'C';
 
 CREATEFUNCTION LWGEOM_gist_decompress(internal) 
-	RETURNS OPAQUE_TYPE
+	RETURNS internal 
 	AS 'MODULE_PATHNAME' ,'LWGEOM_gist_decompress'
 	LANGUAGE 'C';
 
@@ -997,6 +997,7 @@
 
 CREATE OPERATOR CLASS gist_geometry_ops
         DEFAULT FOR TYPE geometry USING gist AS
+	STORAGE 	box2d,
         OPERATOR        1        << 	RECHECK,
         OPERATOR        2        &<	RECHECK,
         OPERATOR        3        &&	RECHECK,
@@ -1017,15 +1018,6 @@
         FUNCTION        6        LWGEOM_gist_picksplit (internal, internal),
         FUNCTION        7        LWGEOM_gist_same (box2d, box2d, internal);
 
-UPDATE pg_opclass 
-	SET opckeytype = (SELECT oid FROM pg_type 
-                          WHERE typname = 'box2d' 
-                          AND typnamespace = (SELECT oid FROM pg_namespace 
-                                              WHERE nspname=current_schema())) 
-	WHERE opcname = 'gist_geometry_ops' 
-        AND opcnamespace = (SELECT oid from pg_namespace 
-                            WHERE nspname=current_schema());
-	
 -- TODO: add btree binding...