diff options
| author | Tom Lane | 2006-09-10 00:29:35 +0000 |
|---|---|---|
| committer | Tom Lane | 2006-09-10 00:29:35 +0000 |
| commit | ba920e1c9182eac55d5f1327ab0d29b721154277 (patch) | |
| tree | 89ae3bed618c49a1a6f103dbaf81398cdf6949e3 /src/backend | |
| parent | 9cea5a82f81fd3347f36a00457b2560a050f3075 (diff) | |
Rename contains/contained-by operators to @> and <@, per discussion that
agreed these symbols are less easily confused. I made new pg_operator
entries (with new OIDs) for the old names, so as to provide backward
compatibility while making it pretty easy to remove the old names in
some future release cycle. This commit only touches the core datatypes,
contrib will be fixed separately.
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/access/gin/README | 6 | ||||
| -rw-r--r-- | src/backend/access/gist/gistproc.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/backend/access/gin/README b/src/backend/access/gin/README index 2827f672689..73c0f540bc0 100644 --- a/src/backend/access/gin/README +++ b/src/backend/access/gin/README @@ -31,9 +31,9 @@ Gin comes with built-in support for one-dimensional arrays (eg. integer[], text[]), but no support for NULL elements. The following operations are available: - * contains: value_array @ query_array - * overlap: value_array && query_array - * contained: value_array ~ query_array + * contains: value_array @> query_array + * overlaps: value_array && query_array + * is contained by: value_array <@ query_array Synopsis -------- diff --git a/src/backend/access/gist/gistproc.c b/src/backend/access/gist/gistproc.c index ff7bd7272ee..ccd54bac120 100644 --- a/src/backend/access/gist/gistproc.c +++ b/src/backend/access/gist/gistproc.c @@ -10,7 +10,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gist/gistproc.c,v 1.7 2006/07/14 14:52:16 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/gist/gistproc.c,v 1.8 2006/09/10 00:29:34 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -542,11 +542,13 @@ gist_box_leaf_consistent(BOX *key, BOX *query, StrategyNumber strategy) PointerGetDatum(query))); break; case RTContainsStrategyNumber: + case RTOldContainsStrategyNumber: retval = DatumGetBool(DirectFunctionCall2(box_contain, PointerGetDatum(key), PointerGetDatum(query))); break; case RTContainedByStrategyNumber: + case RTOldContainedByStrategyNumber: retval = DatumGetBool(DirectFunctionCall2(box_contained, PointerGetDatum(key), PointerGetDatum(query))); @@ -631,11 +633,13 @@ rtree_internal_consistent(BOX *key, BOX *query, StrategyNumber strategy) break; case RTSameStrategyNumber: case RTContainsStrategyNumber: + case RTOldContainsStrategyNumber: retval = DatumGetBool(DirectFunctionCall2(box_contain, PointerGetDatum(key), PointerGetDatum(query))); break; case RTContainedByStrategyNumber: + case RTOldContainedByStrategyNumber: retval = DatumGetBool(DirectFunctionCall2(box_overlap, PointerGetDatum(key), PointerGetDatum(query))); |