From c79a760c46b18312967d27a9bcb38cd92d001b16 Mon Sep 17 00:00:00 2001
From: Bborie Park <bkpark at ucdavis.edu>
Date: Wed, 14 Dec 2011 23:51:24 +0000
Subject: [PATCH] Renamed operator functions and made appropriate changes to
 associated operators to be inline with usage for geometry and geography. 
 Associated ticket is #633.  Existing users will not be affected as the
 upgrade scripts do not drop or add new operators.

git-svn-id: http://svn.osgeo.org/postgis/trunk@8421 b70326c6-7e19-0410-871a-916f4a2858ee
---
 raster/rt_pg/rtpostgis.sql.in.c           | 48 +++++++++++------------
 raster/rt_pg/rtpostgis_drop.sql.in.c      | 28 +++++++++++++
 raster/test/regress/rt_above.sql          |  6 +--
 raster/test/regress/rt_above_expected     |  2 +-
 raster/test/regress/rt_below.sql          |  6 +--
 raster/test/regress/rt_below_expected     |  2 +-
 raster/test/regress/rt_contain.sql        |  6 +--
 raster/test/regress/rt_contain_expected   |  2 +-
 raster/test/regress/rt_contained.sql      |  6 +--
 raster/test/regress/rt_contained_expected |  2 +-
 raster/test/regress/rt_left.sql           |  6 +--
 raster/test/regress/rt_left_expected      |  2 +-
 raster/test/regress/rt_overabove.sql      |  6 +--
 raster/test/regress/rt_overabove_expected |  2 +-
 raster/test/regress/rt_overbelow.sql      |  6 +--
 raster/test/regress/rt_overbelow_expected |  2 +-
 raster/test/regress/rt_overlap.sql        |  6 +--
 raster/test/regress/rt_overlap_expected   |  2 +-
 raster/test/regress/rt_overleft.sql       |  6 +--
 raster/test/regress/rt_overleft_expected  |  2 +-
 raster/test/regress/rt_overright.sql      |  6 +--
 raster/test/regress/rt_overright_expected |  2 +-
 raster/test/regress/rt_right.sql          |  6 +--
 raster/test/regress/rt_right_expected     |  2 +-
 raster/test/regress/rt_same.sql           | 10 ++---
 raster/test/regress/rt_same_expected      |  4 +-
 26 files changed, 103 insertions(+), 75 deletions(-)

diff --git a/raster/rt_pg/rtpostgis.sql.in.c b/raster/rt_pg/rtpostgis.sql.in.c
index e807a3e46..0684e96c4 100644
--- a/raster/rt_pg/rtpostgis.sql.in.c
+++ b/raster/rt_pg/rtpostgis.sql.in.c
@@ -2828,62 +2828,62 @@ CREATE CAST (raster AS bytea)
 --  GiST index OPERATOR support functions
 ------------------------------------------------------------------------------
 
-CREATE OR REPLACE FUNCTION st_overleft(raster, raster)
+CREATE OR REPLACE FUNCTION raster_overleft(raster, raster)
     RETURNS bool
     AS 'select $1::geometry &< $2::geometry'
     LANGUAGE 'SQL' IMMUTABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_overright(raster, raster)
+CREATE OR REPLACE FUNCTION raster_overright(raster, raster)
     RETURNS bool
     AS 'select $1::geometry &> $2::geometry'
     LANGUAGE 'SQL' IMMUTABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_left(raster, raster)
+CREATE OR REPLACE FUNCTION raster_left(raster, raster)
     RETURNS bool
     AS 'select $1::geometry << $2::geometry'
     LANGUAGE 'SQL' IMMUTABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_right(raster, raster)
+CREATE OR REPLACE FUNCTION raster_right(raster, raster)
     RETURNS bool
     AS 'select $1::geometry >> $2::geometry'
     LANGUAGE 'SQL' IMMUTABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_overabove(raster, raster)
+CREATE OR REPLACE FUNCTION raster_overabove(raster, raster)
     RETURNS bool
     AS 'select $1::geometry |&> $2::geometry'
     LANGUAGE 'SQL' IMMUTABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_overbelow(raster, raster)
+CREATE OR REPLACE FUNCTION raster_overbelow(raster, raster)
     RETURNS bool
     AS 'select $1::geometry &<| $2::geometry'
     LANGUAGE 'SQL' IMMUTABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_above(raster, raster)
+CREATE OR REPLACE FUNCTION raster_above(raster, raster)
     RETURNS bool
     AS 'select $1::geometry |>> $2::geometry'
     LANGUAGE 'SQL' IMMUTABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_below(raster, raster)
+CREATE OR REPLACE FUNCTION raster_below(raster, raster)
     RETURNS bool
     AS 'select $1::geometry <<| $2::geometry'
     LANGUAGE 'SQL' IMMUTABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_same(raster, raster)
+CREATE OR REPLACE FUNCTION raster_same(raster, raster)
     RETURNS bool
     AS 'select $1::geometry ~= $2::geometry'
     LANGUAGE 'SQL' IMMUTABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_contained(raster, raster)
+CREATE OR REPLACE FUNCTION raster_contained(raster, raster)
     RETURNS bool
     AS 'select $1::geometry @ $2::geometry'
     LANGUAGE 'SQL' IMMUTABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_contain(raster, raster)
+CREATE OR REPLACE FUNCTION raster_contain(raster, raster)
     RETURNS bool
     AS 'select $1::geometry ~ $2::geometry'
     LANGUAGE 'SQL' IMMUTABLE STRICT;
 
-CREATE OR REPLACE FUNCTION st_overlap(raster, raster)
+CREATE OR REPLACE FUNCTION raster_overlap(raster, raster)
     RETURNS bool
     AS 'select $1::geometry && $2::geometry'
     LANGUAGE 'SQL' IMMUTABLE STRICT;
@@ -2893,73 +2893,73 @@ CREATE OR REPLACE FUNCTION st_overlap(raster, raster)
 ------------------------------------------------------------------------------
 
 CREATE OPERATOR << (
-    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_left,
+    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = raster_left,
     COMMUTATOR = '>>',
     RESTRICT = positionsel, JOIN = positionjoinsel
     );
 
 CREATE OPERATOR &< (
-    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_overleft,
+    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = raster_overleft,
     COMMUTATOR = '&>',
     RESTRICT = positionsel, JOIN = positionjoinsel
     );
 
 CREATE OPERATOR <<| (
-    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_below,
+    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = raster_below,
     COMMUTATOR = '|>>',
     RESTRICT = positionsel, JOIN = positionjoinsel
     );
 
 CREATE OPERATOR &<| (
-    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_overbelow,
+    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = raster_overbelow,
     COMMUTATOR = '|&>',
     RESTRICT = positionsel, JOIN = positionjoinsel
     );
 
 CREATE OPERATOR && (
-    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_overlap,
+    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = raster_overlap,
     COMMUTATOR = '&&',
     RESTRICT = contsel, JOIN = contjoinsel
     );
 
 CREATE OPERATOR &> (
-    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_overright,
+    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = raster_overright,
     COMMUTATOR = '&<',
     RESTRICT = positionsel, JOIN = positionjoinsel
     );
 
 CREATE OPERATOR >> (
-    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_right,
+    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = raster_right,
     COMMUTATOR = '<<',
     RESTRICT = positionsel, JOIN = positionjoinsel
     );
 
 CREATE OPERATOR |&> (
-    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_overabove,
+    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = raster_overabove,
     COMMUTATOR = '&<|',
     RESTRICT = positionsel, JOIN = positionjoinsel
     );
 
 CREATE OPERATOR |>> (
-    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_above,
+    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = raster_above,
     COMMUTATOR = '<<|',
     RESTRICT = positionsel, JOIN = positionjoinsel
     );
 
 CREATE OPERATOR ~= (
-    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_same,
+    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = raster_same,
     COMMUTATOR = '~=',
     RESTRICT = eqsel, JOIN = eqjoinsel
     );
 
 CREATE OPERATOR @ (
-    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_contained,
+    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = raster_contained,
     COMMUTATOR = '~',
     RESTRICT = contsel, JOIN = contjoinsel
     );
 
 CREATE OPERATOR ~ (
-    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = st_contain,
+    LEFTARG = raster, RIGHTARG = raster, PROCEDURE = raster_contain,
     COMMUTATOR = '@',
     RESTRICT = contsel, JOIN = contjoinsel
     );
diff --git a/raster/rt_pg/rtpostgis_drop.sql.in.c b/raster/rt_pg/rtpostgis_drop.sql.in.c
index b3ac89f5b..b0255b40c 100644
--- a/raster/rt_pg/rtpostgis_drop.sql.in.c
+++ b/raster/rt_pg/rtpostgis_drop.sql.in.c
@@ -23,6 +23,34 @@
 -- Drop obsolete functions 
 -- (which fully obsolete, changed to take default args, or outp params changed) --
 
+-- GIST operator functions
+/* commented out for Regina's consideration
+DROP OPERATOR IF EXISTS << (raster, raster);
+DROP FUNCTION IF EXISTS st_left(raster, raster);
+DROP OPERATOR IF EXISTS &< (raster, raster);
+DROP FUNCTION IF EXISTS st_overleft(raster, raster);
+DROP OPERATOR IF EXISTS <<| (raster, raster);
+DROP FUNCTION IF EXISTS st_below(raster, raster);
+DROP OPERATOR IF EXISTS &<| (raster, raster);
+DROP FUNCTION IF EXISTS st_overbelow(raster, raster);
+DROP OPERATOR IF EXISTS && (raster, raster);
+DROP FUNCTION IF EXISTS st_overlap(raster, raster);
+DROP OPERATOR IF EXISTS &> (raster, raster);
+DROP FUNCTION IF EXISTS st_overright(raster, raster);
+DROP OPERATOR IF EXISTS >> (raster, raster);
+DROP FUNCTION IF EXISTS st_right(raster, raster);
+DROP OPERATOR IF EXISTS |&> (raster, raster);
+DROP FUNCTION IF EXISTS st_overabove(raster, raster);
+DROP OPERATOR IF EXISTS |>> (raster, raster);
+DROP FUNCTION IF EXISTS st_above(raster, raster);
+DROP OPERATOR IF EXISTS ~= (raster, raster);
+DROP FUNCTION IF EXISTS st_same(raster, raster);
+DROP OPERATOR IF EXISTS @ (raster, raster);
+DROP FUNCTION IF EXISTS st_contained(raster, raster);
+DROP OPERATOR IF EXISTS ~ (raster, raster);
+DROP FUNCTION IF EXISTS st_contain(raster, raster);
+*/
+
 -- drop box2d
 DROP CAST IF EXISTS (raster AS box2d);
 DROP FUNCTION IF EXISTS box2d(raster);
diff --git a/raster/test/regress/rt_above.sql b/raster/test/regress/rt_above.sql
index d83704a56..1fa83918c 100644
--- a/raster/test/regress/rt_above.sql
+++ b/raster/test/regress/rt_above.sql
@@ -8,9 +8,9 @@
 -----------------------------------------------------------------------
 
 -----------------------------------------------------------------------
--- st_above
+-- raster_above
 -----------------------------------------------------------------------
-SELECT 'st_above(X, query(1,1))' as op,
+SELECT 'raster_above(X, query(1,1))' as op,
         count(a.y),
         min(a.x) as xmin,
         max(a.x) as xmax,
@@ -19,7 +19,7 @@ SELECT 'st_above(X, query(1,1))' as op,
         st_extent(a.tile)
 FROM rt_gist_grid_test a, rt_gist_query_test b
 WHERE b.x = 1 and b.y = 1
-    AND st_above(a.tile, b.tile);
+    AND raster_above(a.tile, b.tile);
 
 -----------------------------------------------------------------------
 -- Test |>> above
diff --git a/raster/test/regress/rt_above_expected b/raster/test/regress/rt_above_expected
index 3cd8174b9..dec00ff6a 100644
--- a/raster/test/regress/rt_above_expected
+++ b/raster/test/regress/rt_above_expected
@@ -1,2 +1,2 @@
-st_above(X, query(1,1))|30|0|9|7|9|BOX(-100 40,100 100)
+raster_above(X, query(1,1))|30|0|9|7|9|BOX(-100 40,100 100)
 X |>> query(1,1)|30|0|9|7|9|BOX(-100 40,100 100)
diff --git a/raster/test/regress/rt_below.sql b/raster/test/regress/rt_below.sql
index 4c7844b5f..375f2a44d 100644
--- a/raster/test/regress/rt_below.sql
+++ b/raster/test/regress/rt_below.sql
@@ -8,10 +8,10 @@
 -----------------------------------------------------------------------
 
 -------------------------------------------------------------------
--- st_below
+-- raster_below
 -----------------------------------------------------------------------
 
-SELECT 'st_below(X, query(1,1))' as op,
+SELECT 'raster_below(X, query(1,1))' as op,
         count(a.y),
         min(a.x) as xmin,
         max(a.x) as xmax,
@@ -20,7 +20,7 @@ SELECT 'st_below(X, query(1,1))' as op,
         st_extent(a.tile)
 FROM rt_gist_grid_test a, rt_gist_query_test b
 WHERE b.x = 1 and b.y = 1
-    AND st_below(a.tile, b.tile);
+    AND raster_below(a.tile, b.tile);
 
 -----------------------------------------------------------------------
 -- Test <<| operator (below)
diff --git a/raster/test/regress/rt_below_expected b/raster/test/regress/rt_below_expected
index 040de33cd..8df2740c7 100644
--- a/raster/test/regress/rt_below_expected
+++ b/raster/test/regress/rt_below_expected
@@ -1,2 +1,2 @@
-st_below(X, query(1,1))|30|0|9|0|2|BOX(-100 -100,100 -40)
+raster_below(X, query(1,1))|30|0|9|0|2|BOX(-100 -100,100 -40)
 X <<| query(1,1)|30|0|9|0|2|BOX(-100 -100,100 -40)
diff --git a/raster/test/regress/rt_contain.sql b/raster/test/regress/rt_contain.sql
index 917156890..f80ecd445 100644
--- a/raster/test/regress/rt_contain.sql
+++ b/raster/test/regress/rt_contain.sql
@@ -8,10 +8,10 @@
 -----------------------------------------------------------------------
 
 -------------------------------------------------------------------
--- st_contain
+-- raster_contain
 -----------------------------------------------------------------------
 
-SELECT 'st_contain(query(1,1), X)' as op,
+SELECT 'raster_contain(query(1,1), X)' as op,
         count(a.y),
         min(a.x) as xmin,
         max(a.x) as xmax,
@@ -20,7 +20,7 @@ SELECT 'st_contain(query(1,1), X)' as op,
         st_extent(a.tile)
 FROM rt_gist_grid_test a, rt_gist_query_test b
 WHERE b.x = 1 and b.y = 1
-    AND st_contain(b.tile, a.tile);
+    AND raster_contain(b.tile, a.tile);
 
 -----------------------------------------------------------------------
 -- Test ~ operator (contains)
diff --git a/raster/test/regress/rt_contain_expected b/raster/test/regress/rt_contain_expected
index 7bd40a199..354f3a751 100644
--- a/raster/test/regress/rt_contain_expected
+++ b/raster/test/regress/rt_contain_expected
@@ -1,2 +1,2 @@
-st_contain(query(1,1), X)|4|4|5|4|5|BOX(-20 -20,20 20)
+raster_contain(query(1,1), X)|4|4|5|4|5|BOX(-20 -20,20 20)
 query(1,1) ~ X|4|4|5|4|5|BOX(-20 -20,20 20)
diff --git a/raster/test/regress/rt_contained.sql b/raster/test/regress/rt_contained.sql
index 88351b236..638183189 100644
--- a/raster/test/regress/rt_contained.sql
+++ b/raster/test/regress/rt_contained.sql
@@ -8,10 +8,10 @@
 -----------------------------------------------------------------------
 
 -------------------------------------------------------------------
--- st_contained
+-- raster_contained
 -----------------------------------------------------------------------
 
-SELECT 'st_contained(X, query(1,1))' as op,
+SELECT 'raster_contained(X, query(1,1))' as op,
         count(a.y),
         min(a.x) as xmin,
         max(a.x) as xmax,
@@ -20,7 +20,7 @@ SELECT 'st_contained(X, query(1,1))' as op,
         st_extent(a.tile)
 FROM rt_gist_grid_test a, rt_gist_query_test b
 WHERE b.x = 1 and b.y = 1
-    AND st_contained(a.tile, b.tile);
+    AND raster_contained(a.tile, b.tile);
 
 -----------------------------------------------------------------------
 -- Test @ operator (contained by)
diff --git a/raster/test/regress/rt_contained_expected b/raster/test/regress/rt_contained_expected
index d6cb4ca27..b2a7f2f5f 100644
--- a/raster/test/regress/rt_contained_expected
+++ b/raster/test/regress/rt_contained_expected
@@ -1,2 +1,2 @@
-st_contained(X, query(1,1))|4|4|5|4|5|BOX(-20 -20,20 20)
+raster_contained(X, query(1,1))|4|4|5|4|5|BOX(-20 -20,20 20)
 X @ query(1,1)|4|4|5|4|5|BOX(-20 -20,20 20)
diff --git a/raster/test/regress/rt_left.sql b/raster/test/regress/rt_left.sql
index 27732db2a..823eae6e2 100644
--- a/raster/test/regress/rt_left.sql
+++ b/raster/test/regress/rt_left.sql
@@ -8,10 +8,10 @@
 -----------------------------------------------------------------------
 
 -------------------------------------------------------------------
--- st_left
+-- raster_left
 -----------------------------------------------------------------------
 
-SELECT 'st_left(X, query(1,1))' as op,
+SELECT 'raster_left(X, query(1,1))' as op,
         count(a.y),
         min(a.x) as xmin,
         max(a.x) as xmax,
@@ -20,7 +20,7 @@ SELECT 'st_left(X, query(1,1))' as op,
         st_extent(a.tile)
 FROM rt_gist_grid_test a, rt_gist_query_test b
 WHERE b.x = 1 and b.y = 1
-    AND st_left(a.tile, b.tile);
+    AND raster_left(a.tile, b.tile);
 
 -----------------------------------------------------------------------
 -- Test << operator (left)
diff --git a/raster/test/regress/rt_left_expected b/raster/test/regress/rt_left_expected
index f988d03b2..9d48d731f 100644
--- a/raster/test/regress/rt_left_expected
+++ b/raster/test/regress/rt_left_expected
@@ -1,2 +1,2 @@
-st_left(X, query(1,1))|30|0|2|0|9|BOX(-100 -100,-40 100)
+raster_left(X, query(1,1))|30|0|2|0|9|BOX(-100 -100,-40 100)
 X << query(1,1)|30|0|2|0|9|BOX(-100 -100,-40 100)
diff --git a/raster/test/regress/rt_overabove.sql b/raster/test/regress/rt_overabove.sql
index 79908386b..c4cdd7f21 100644
--- a/raster/test/regress/rt_overabove.sql
+++ b/raster/test/regress/rt_overabove.sql
@@ -8,10 +8,10 @@
 -----------------------------------------------------------------------
 
 -------------------------------------------------------------------
--- st_overabove
+-- raster_overabove
 -----------------------------------------------------------------------
 
-SELECT 'st_overabove(X, query(1,1))' as op,
+SELECT 'raster_overabove(X, query(1,1))' as op,
         count(a.y),
         min(a.x) as xmin,
         max(a.x) as xmax,
@@ -20,7 +20,7 @@ SELECT 'st_overabove(X, query(1,1))' as op,
         st_extent(a.tile)
 FROM rt_gist_grid_test a, rt_gist_query_test b
 WHERE b.x = 1 and b.y = 1
-    AND st_overabove(a.tile, b.tile);
+    AND raster_overabove(a.tile, b.tile);
 
 -----------------------------------------------------------------------
 -- Test |&> operator (overabove)
diff --git a/raster/test/regress/rt_overabove_expected b/raster/test/regress/rt_overabove_expected
index cf1f7c0ec..3cf8d5e33 100644
--- a/raster/test/regress/rt_overabove_expected
+++ b/raster/test/regress/rt_overabove_expected
@@ -1,2 +1,2 @@
-st_overabove(X, query(1,1))|60|0|9|4|9|BOX(-100 -20,100 100)
+raster_overabove(X, query(1,1))|60|0|9|4|9|BOX(-100 -20,100 100)
 X |&> query(1,1)|60|0|9|4|9|BOX(-100 -20,100 100)
diff --git a/raster/test/regress/rt_overbelow.sql b/raster/test/regress/rt_overbelow.sql
index f6a2e0d8a..7cb6a32be 100644
--- a/raster/test/regress/rt_overbelow.sql
+++ b/raster/test/regress/rt_overbelow.sql
@@ -8,10 +8,10 @@
 -----------------------------------------------------------------------
 
 -------------------------------------------------------------------
--- st_overbelow
+-- raster_overbelow
 -----------------------------------------------------------------------
 
-SELECT 'st_overbelow(X, query(1,1))' as op,
+SELECT 'raster_overbelow(X, query(1,1))' as op,
         count(a.y),
         min(a.x) as xmin,
         max(a.x) as xmax,
@@ -20,7 +20,7 @@ SELECT 'st_overbelow(X, query(1,1))' as op,
         st_extent(a.tile)
 FROM rt_gist_grid_test a, rt_gist_query_test b
 WHERE b.x = 1 and b.y = 1
-    AND st_overbelow(a.tile, b.tile);
+    AND raster_overbelow(a.tile, b.tile);
 
 -----------------------------------------------------------------------
 -- Test &<| operator (overbelow)
diff --git a/raster/test/regress/rt_overbelow_expected b/raster/test/regress/rt_overbelow_expected
index d50b9e9b9..60965031b 100644
--- a/raster/test/regress/rt_overbelow_expected
+++ b/raster/test/regress/rt_overbelow_expected
@@ -1,2 +1,2 @@
-st_overbelow(X, query(1,1))|60|0|9|0|5|BOX(-100 -100,100 20)
+raster_overbelow(X, query(1,1))|60|0|9|0|5|BOX(-100 -100,100 20)
 X &<| query(1,1)|60|0|9|0|5|BOX(-100 -100,100 20)
diff --git a/raster/test/regress/rt_overlap.sql b/raster/test/regress/rt_overlap.sql
index 236c5323f..57ad1de1d 100644
--- a/raster/test/regress/rt_overlap.sql
+++ b/raster/test/regress/rt_overlap.sql
@@ -8,10 +8,10 @@
 -----------------------------------------------------------------------
 
 -------------------------------------------------------------------
--- st_overlap
+-- raster_overlap
 -----------------------------------------------------------------------
 
-SELECT 'st_overlap(X, query(1,1))' as op,
+SELECT 'raster_overlap(X, query(1,1))' as op,
         count(a.y),
         min(a.x) as xmin,
         max(a.x) as xmax,
@@ -20,7 +20,7 @@ SELECT 'st_overlap(X, query(1,1))' as op,
         st_extent(a.tile)
 FROM rt_gist_grid_test a, rt_gist_query_test b
 WHERE b.x = 1 and b.y = 1
-    AND st_overlap(a.tile, b.tile);
+    AND raster_overlap(a.tile, b.tile);
 
 -----------------------------------------------------------------------
 -- Test && operator (overlap)
diff --git a/raster/test/regress/rt_overlap_expected b/raster/test/regress/rt_overlap_expected
index 4636ae21d..807742d4e 100644
--- a/raster/test/regress/rt_overlap_expected
+++ b/raster/test/regress/rt_overlap_expected
@@ -1,2 +1,2 @@
-st_overlap(X, query(1,1))|16|3|6|3|6|BOX(-40 -40,40 40)
+raster_overlap(X, query(1,1))|16|3|6|3|6|BOX(-40 -40,40 40)
 X && query(1,1)|16|3|6|3|6|BOX(-40 -40,40 40)
diff --git a/raster/test/regress/rt_overleft.sql b/raster/test/regress/rt_overleft.sql
index 047e461d9..2282d1a94 100644
--- a/raster/test/regress/rt_overleft.sql
+++ b/raster/test/regress/rt_overleft.sql
@@ -8,10 +8,10 @@
 -----------------------------------------------------------------------
 
 -----------------------------------------------------------------------
--- st_overleft
+-- raster_overleft
 -----------------------------------------------------------------------
 
-SELECT 'st_overleft(X, query(1,1))' as op,
+SELECT 'raster_overleft(X, query(1,1))' as op,
         count(a.y),
         min(a.x) as xmin,
         max(a.x) as xmax,
@@ -20,7 +20,7 @@ SELECT 'st_overleft(X, query(1,1))' as op,
         st_extent(a.tile)
 FROM rt_gist_grid_test a, rt_gist_query_test b
 WHERE b.x = 1 and b.y = 1
-    AND st_overleft(a.tile, b.tile);
+    AND raster_overleft(a.tile, b.tile);
 
 -----------------------------------------------------------------------
 -- Test &< operator (overleft)
diff --git a/raster/test/regress/rt_overleft_expected b/raster/test/regress/rt_overleft_expected
index b962cee9d..9c27f222e 100644
--- a/raster/test/regress/rt_overleft_expected
+++ b/raster/test/regress/rt_overleft_expected
@@ -1,2 +1,2 @@
-st_overleft(X, query(1,1))|60|0|5|0|9|BOX(-100 -100,20 100)
+raster_overleft(X, query(1,1))|60|0|5|0|9|BOX(-100 -100,20 100)
 X &< query(1,1)|60|0|5|0|9|BOX(-100 -100,20 100)
diff --git a/raster/test/regress/rt_overright.sql b/raster/test/regress/rt_overright.sql
index dc7d74044..fe302d9d3 100644
--- a/raster/test/regress/rt_overright.sql
+++ b/raster/test/regress/rt_overright.sql
@@ -8,9 +8,9 @@
 -----------------------------------------------------------------------
 
 -----------------------------------------------------------------------
--- st_overright
+-- raster_overright
 -----------------------------------------------------------------------
-SELECT 'st_overright(X, query(1,1))' as op,
+SELECT 'raster_overright(X, query(1,1))' as op,
         count(a.y),
         min(a.x) as xmin,
         max(a.x) as xmax,
@@ -19,7 +19,7 @@ SELECT 'st_overright(X, query(1,1))' as op,
         st_extent(a.tile)
 FROM rt_gist_grid_test a, rt_gist_query_test b
 WHERE b.x = 1 and b.y = 1
-    AND st_overright(a.tile, b.tile);
+    AND raster_overright(a.tile, b.tile);
 
 -----------------------------------------------------------------------
 -- Test &> operator (overright)
diff --git a/raster/test/regress/rt_overright_expected b/raster/test/regress/rt_overright_expected
index 7491de952..8ca465cb2 100644
--- a/raster/test/regress/rt_overright_expected
+++ b/raster/test/regress/rt_overright_expected
@@ -1,2 +1,2 @@
-st_overright(X, query(1,1))|60|4|9|0|9|BOX(-20 -100,100 100)
+raster_overright(X, query(1,1))|60|4|9|0|9|BOX(-20 -100,100 100)
 X &> query(1,1)|60|4|9|0|9|BOX(-20 -100,100 100)
diff --git a/raster/test/regress/rt_right.sql b/raster/test/regress/rt_right.sql
index 4bc7fa9fd..80fb8710a 100644
--- a/raster/test/regress/rt_right.sql
+++ b/raster/test/regress/rt_right.sql
@@ -8,10 +8,10 @@
 -----------------------------------------------------------------------
 
 -------------------------------------------------------------------
--- st_right
+-- raster_right
 -----------------------------------------------------------------------
 
-SELECT 'st_right(X, query(1,1))' as op,
+SELECT 'raster_right(X, query(1,1))' as op,
         count(a.y),
         min(a.x) as xmin,
         max(a.x) as xmax,
@@ -20,7 +20,7 @@ SELECT 'st_right(X, query(1,1))' as op,
         st_extent(a.tile)
 FROM rt_gist_grid_test a, rt_gist_query_test b
 WHERE b.x = 1 and b.y = 1
-    AND st_right(a.tile, b.tile);
+    AND raster_right(a.tile, b.tile);
 
 -----------------------------------------------------------------------
 -- Test >> operator (right)
diff --git a/raster/test/regress/rt_right_expected b/raster/test/regress/rt_right_expected
index e3bf9c03d..bba65fc9d 100644
--- a/raster/test/regress/rt_right_expected
+++ b/raster/test/regress/rt_right_expected
@@ -1,2 +1,2 @@
-st_right(X, query(1,1))|30|7|9|0|9|BOX(40 -100,100 100)
+raster_right(X, query(1,1))|30|7|9|0|9|BOX(40 -100,100 100)
 X >> query(1,1)|30|7|9|0|9|BOX(40 -100,100 100)
diff --git a/raster/test/regress/rt_same.sql b/raster/test/regress/rt_same.sql
index 13372ff69..353927e7d 100644
--- a/raster/test/regress/rt_same.sql
+++ b/raster/test/regress/rt_same.sql
@@ -8,10 +8,10 @@
 -----------------------------------------------------------------------
 
 -------------------------------------------------------------------
--- st_same
+-- raster_same
 -----------------------------------------------------------------------
 
-SELECT 'st_same(X, query(1,1))' as op,
+SELECT 'raster_same(X, query(1,1))' as op,
         count(a.y),
         min(a.x) as xmin,
         max(a.x) as xmax,
@@ -20,9 +20,9 @@ SELECT 'st_same(X, query(1,1))' as op,
         st_extent(a.tile)
 FROM rt_gist_grid_test a, rt_gist_query_test b
 WHERE b.x = 1 and b.y = 1
-    AND st_same(a.tile, b.tile);
+    AND raster_same(a.tile, b.tile);
 
-SELECT 'st_same(X, query(7,7))' as op,
+SELECT 'raster_same(X, query(7,7))' as op,
         count(a.y),
         min(a.x) as xmin,
         max(a.x) as xmax,
@@ -31,7 +31,7 @@ SELECT 'st_same(X, query(7,7))' as op,
         st_extent(a.tile)
 FROM rt_gist_grid_test a, rt_gist_grid_test b
 WHERE b.x = 7 and b.y = 7
-    AND st_same(a.tile, b.tile);
+    AND raster_same(a.tile, b.tile);
 
 -----------------------------------------------------------------------
 -- Test ~= operator (same)
diff --git a/raster/test/regress/rt_same_expected b/raster/test/regress/rt_same_expected
index dbd5a66ae..f342fc757 100644
--- a/raster/test/regress/rt_same_expected
+++ b/raster/test/regress/rt_same_expected
@@ -1,4 +1,4 @@
-st_same(X, query(1,1))|0|||||
-st_same(X, query(7,7))|1|7|7|7|7|BOX(40 40,60 60)
+raster_same(X, query(1,1))|0|||||
+raster_same(X, query(7,7))|1|7|7|7|7|BOX(40 40,60 60)
 X ~= query(1,1)|0|||||
 X ~= tile(7,7)|1|7|7|7|7|BOX(40 40,60 60)
-- 
2.40.0