Changeset 3287

Timestamp:

11/11/08 12:38:10 (4 years ago)

Author:

pramsey

Message:

PostgreSQL 8.4 support (#62)

Location:

branches/1.3

Files:

• lwgeom/lwgeom_gist.c (modified) (1 diff)
• lwgeom/lwpostgis.sql.in (modified) (2 diffs)
• regress/run_test (modified) (1 diff)

branches/1.3/lwgeom/lwgeom_gist.c

@@ -599 +599 @@
 #endif
 
+#if USE_VERSION >= 84
+        /* PostgreSQL 8.4 and later require the RECHECK flag to be set here,
+           rather than being supplied as part of the operator class definition */
+        bool *recheck = (bool *) PG_GETARG_POINTER(4);
+
+        /* And since the index is lossy from conversion from float8 to float4, we must
+        recheck */
+        *recheck = true;
+#endif
+
 #ifdef PGIS_DEBUG_CALLS
         elog(NOTICE,"GIST: LWGEOM_gist_consistent called");

branches/1.3/lwgeom/lwpostgis.sql.in

@@ -1306 +1306 @@
 #else
 
---
--- Create opclass index bindings for PG>=73
+#if USE_VERSION < 84 
+
+--
+-- Create opclass index bindings for PG>=73 and PG<=83
 --
 
@@ -1342 +1344 @@
         
 -- TODO: add btree binding...
+
+#else
+
+--
+-- Create opclass index bindings for PG>83 
+-- (No RECHECK since this is now handled as part of the GiST Access methods)
+--
+
+CREATE OPERATOR CLASS gist_geometry_ops
+        DEFAULT FOR TYPE geometry USING gist AS
+        STORAGE         box2d,
+        OPERATOR        1        <<,
+        OPERATOR        2        &<,
+        OPERATOR        3        &&,
+        OPERATOR        4        &>,
+        OPERATOR        5        >>,
+        OPERATOR        6        ~=,
+        OPERATOR        7        ~,
+        OPERATOR        8        @,
+        OPERATOR        9        &<|,
+        OPERATOR        10       <<|,
+        OPERATOR        11       |>>,
+        OPERATOR        12       |&>,
+        FUNCTION        1        LWGEOM_gist_consistent (internal, geometry, int4),
+        FUNCTION        2        LWGEOM_gist_union (bytea, internal),
+        FUNCTION        3        LWGEOM_gist_compress (internal),
+        FUNCTION        4        LWGEOM_gist_decompress (internal),
+        FUNCTION        5        LWGEOM_gist_penalty (internal, internal, internal),
+        FUNCTION        6        LWGEOM_gist_picksplit (internal, internal),
+        FUNCTION        7        LWGEOM_gist_same (box2d, box2d, internal);
+
+#endif
 
 #endif

branches/1.3/regress/run_test

@@ -124 +124 @@
                 | grep -v "^CREATE" \
                 | grep -v "^SET" \
+                | grep -v "^LINE " \
+                | grep -v "\^$" \
                 | sed 's/Infinity/inf/g;s/Inf/inf/g;s/1\.#INF/inf/g' \
                 | sed 's/[eE]\([+-]\)0\{1,\}\([0-9]\{1,\}\)/e\1\2/g' \