MonetDB: Jun2016 - used new geometry functions

[Niels Nes]

Changeset: 7eced1a4e333 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7eced1a4e333
Modified Files:
        sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.sql
        sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.stable.out
Branch: Jun2016
Log Message:

used new geometry functions


diffs (46 lines):

diff --git a/sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.sql 
b/sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.sql
--- a/sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.sql
+++ b/sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.sql
@@ -7,13 +7,13 @@ INSERT INTO input_double VALUES ('longit
 
 
 CREATE TABLE v(a1 int, a2 point, prob double);
-insert into v values(0,sys.point(50,4),1);
-insert into v values(1,sys.point(51,5),1);
-insert into v values(2,sys.point(52,6),1);
+insert into v values(0,'point(50 4)',1);
+insert into v values(1,'point(51 5)',1);
+insert into v values(2,'point(52 6)',1);
 
 
 CREATE VIEW p AS 
-SELECT sys.point(a1,a2) AS a1, prob AS prob 
+SELECT ST_Point(a1,a2) AS a1, prob AS prob 
 FROM (
          SELECT tmp_2.a2 AS a1, tmp_3.a2 AS a2, tmp_2.prob * tmp_3.prob AS 
prob 
          FROM 
@@ -22,7 +22,7 @@ FROM (
 ) AS tmp;
 
 CREATE VIEW r AS 
-SELECT a1 AS a1, sys.distance(a2,a3) AS prob 
+SELECT a1 AS a1, ST_Distance(a2,a3) AS prob 
 FROM (
          SELECT v.a1 AS a1, v.a2 AS a2, p.a1 AS a3, v.prob * p.prob AS prob 
          FROM v,p
diff --git a/sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.stable.out 
b/sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.stable.out
--- a/sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.stable.out
+++ b/sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.stable.out
@@ -79,10 +79,10 @@ project (
 | | | | | | | ) [ input_double.a1 = clob "longitude" ]
 | | | | | | ) [ input_double.a2 as tmp_3.a2 ]
 | | | | | ) [  ]
-| | | | ) [ sys.point(tmp_2.a2 as tmp.a1, tmp_3.a2 as tmp.a2) as L.a1 ]
+| | | | ) [ sys.st_point(tmp_2.a2 as tmp.a1, tmp_3.a2 as tmp.a2) as L.a1 ]
 | | | ) [  ]
 | | ) [ v.a1, v.a2, L.a1 as p.a1 ]
-| ) [ v.a1 as L.a1, sys.distance(v.a2 as tmp.a2, p.a1 as tmp.a3) as L.prob ]
+| ) [ v.a1 as L.a1, sys.st_distance(v.a2 as tmp.a2, p.a1 as tmp.a3) as L.prob ]
 ) [ L.a1 as r.a1, L.prob as r.prob ]
 
 # 14:00:10 >  
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list