From 003132d178e7a13fbdaf96781d2c43f209b528d0 Mon Sep 17 00:00:00 2001
From: Noah Misch <noah@leadboat.com>
Date: Sun, 29 Jul 2018 12:02:07 -0700
Subject: [PATCH] Fix earthdistance test suite function name typo.
Affected test queries have been testing the wrong thing since their
introduction in commit 4c1383efd132e4f532213c8a8cc63a455f55e344.
Back-patch to 9.3 (all supported versions).
---
.../earthdistance/expected/earthdistance.out | 44 ++++++++++---------
contrib/earthdistance/sql/earthdistance.sql | 8 ++--
2 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/contrib/earthdistance/expected/earthdistance.out b/contrib/earthdistance/expected/earthdistance.out
index 9bd556fc22..c31de952ad 100644
--- a/contrib/earthdistance/expected/earthdistance.out
+++ b/contrib/earthdistance/expected/earthdistance.out
@@ -881,11 +881,12 @@ SELECT earth_box(ll_to_earth(90,180),
--
-- Test the recommended constraints.
--
-SELECT is_point(ll_to_earth(0,0));
-ERROR: function is_point(earth) does not exist
-LINE 1: SELECT is_point(ll_to_earth(0,0));
- ^
-HINT: No function matches the given name and argument types. You might need to add explicit type casts.
+SELECT cube_is_point(ll_to_earth(0,0));
+ cube_is_point
+---------------
+ t
+(1 row)
+
SELECT cube_dim(ll_to_earth(0,0)) <= 3;
?column?
----------
@@ -899,11 +900,12 @@ SELECT abs(cube_distance(ll_to_earth(0,0), '(0)'::cube) / earth() - 1) <
t
(1 row)
-SELECT is_point(ll_to_earth(30,60));
-ERROR: function is_point(earth) does not exist
-LINE 1: SELECT is_point(ll_to_earth(30,60));
- ^
-HINT: No function matches the given name and argument types. You might need to add explicit type casts.
+SELECT cube_is_point(ll_to_earth(30,60));
+ cube_is_point
+---------------
+ t
+(1 row)
+
SELECT cube_dim(ll_to_earth(30,60)) <= 3;
?column?
----------
@@ -917,11 +919,12 @@ SELECT abs(cube_distance(ll_to_earth(30,60), '(0)'::cube) / earth() - 1) <
t
(1 row)
-SELECT is_point(ll_to_earth(60,90));
-ERROR: function is_point(earth) does not exist
-LINE 1: SELECT is_point(ll_to_earth(60,90));
- ^
-HINT: No function matches the given name and argument types. You might need to add explicit type casts.
+SELECT cube_is_point(ll_to_earth(60,90));
+ cube_is_point
+---------------
+ t
+(1 row)
+
SELECT cube_dim(ll_to_earth(60,90)) <= 3;
?column?
----------
@@ -935,11 +938,12 @@ SELECT abs(cube_distance(ll_to_earth(60,90), '(0)'::cube) / earth() - 1) <
t
(1 row)
-SELECT is_point(ll_to_earth(-30,-90));
-ERROR: function is_point(earth) does not exist
-LINE 1: SELECT is_point(ll_to_earth(-30,-90));
- ^
-HINT: No function matches the given name and argument types. You might need to add explicit type casts.
+SELECT cube_is_point(ll_to_earth(-30,-90));
+ cube_is_point
+---------------
+ t
+(1 row)
+
SELECT cube_dim(ll_to_earth(-30,-90)) <= 3;
?column?
----------
diff --git a/contrib/earthdistance/sql/earthdistance.sql b/contrib/earthdistance/sql/earthdistance.sql
index 860450276f..4145561217 100644
--- a/contrib/earthdistance/sql/earthdistance.sql
+++ b/contrib/earthdistance/sql/earthdistance.sql
@@ -282,19 +282,19 @@ SELECT earth_box(ll_to_earth(90,180),
-- Test the recommended constraints.
--
-SELECT is_point(ll_to_earth(0,0));
+SELECT cube_is_point(ll_to_earth(0,0));
SELECT cube_dim(ll_to_earth(0,0)) <= 3;
SELECT abs(cube_distance(ll_to_earth(0,0), '(0)'::cube) / earth() - 1) <
'10e-12'::float8;
-SELECT is_point(ll_to_earth(30,60));
+SELECT cube_is_point(ll_to_earth(30,60));
SELECT cube_dim(ll_to_earth(30,60)) <= 3;
SELECT abs(cube_distance(ll_to_earth(30,60), '(0)'::cube) / earth() - 1) <
'10e-12'::float8;
-SELECT is_point(ll_to_earth(60,90));
+SELECT cube_is_point(ll_to_earth(60,90));
SELECT cube_dim(ll_to_earth(60,90)) <= 3;
SELECT abs(cube_distance(ll_to_earth(60,90), '(0)'::cube) / earth() - 1) <
'10e-12'::float8;
-SELECT is_point(ll_to_earth(-30,-90));
+SELECT cube_is_point(ll_to_earth(-30,-90));
SELECT cube_dim(ll_to_earth(-30,-90)) <= 3;
SELECT abs(cube_distance(ll_to_earth(-30,-90), '(0)'::cube) / earth() - 1) <
'10e-12'::float8;
--
2.40.0