MonetDB: Apr2011 - fixes and approve output (geos seems to impro...

[Niels Nes]

Changeset: d8f182d24815 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d8f182d24815
Modified Files:
        geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
        geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.out
        geom/monetdb5/geom.mx
        geom/sql/Tests/relation.sql
Branch: Apr2011
Log Message:

fixes and approve output (geos seems to improve??)


diffs (67 lines):

diff --git a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err 
b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
--- a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
+++ b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
@@ -10,13 +10,14 @@
 # 11:37:42 >  mclient -lsql -umonetdb -Pmonetdb --host=alf --port=30423 
 # 11:37:42 >  
 
-MAPI  = monetdb@rig:30424
+MAPI  = monetdb@alf:35630
 QUERY = COPY 1 RECORDS INTO nodes from STDIN USING DELIMITERS ',', '\n';
-ERROR = !SQLException:sql:value ''POINT(52.0697 4.3723)'' while parsing 
''POINT(52.0697 4.3723)'' from line 0 field 1 not inserted, expecting type wkb
-        !SQLException:importTable:failed to import table
-        !ERROR: ParseException: Unknown type: ''POINT'
+        45111956, 'POINT(52.0697 4.3723)'
+        
+ERROR = !SQLException:importTable:value ' 'POINT(52.0697 4.3723)'' from line 1 
field 2 not inserted, expecting type point
+        !failed to import table
 
-# 11:37:42 >  
-# 11:37:42 >  Done.
-# 11:37:42 >  
+# 13:33:18 >  
+# 13:33:18 >  Done.
+# 13:33:18 >  
 
diff --git a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.out 
b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.out
--- a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.out
+++ b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.out
@@ -15,6 +15,7 @@
 
 
 Ready.
+!ERROR: ParseException: Unknown type: ''POINT'
 
 Over..
 
diff --git a/geom/monetdb5/geom.mx b/geom/monetdb5/geom.mx
--- a/geom/monetdb5/geom.mx
+++ b/geom/monetdb5/geom.mx
@@ -1197,7 +1197,7 @@
                throw(MAL, "geom.@1", "wkb2geos(*a) and wkb2geos(*b) both 
failed");
        }
 
-       *out = @2(ga, gb, @4);
+       *out = @2(ga, gb, * @4);
 
        GEOSGeom_destroy(ga);
        GEOSGeom_destroy(gb);
@@ -1213,7 +1213,7 @@
 @:spatial(Within,GEOSWithin)@
 @:spatial(Contains,GEOSContains)@
 @:spatial(Overlaps,GEOSOverlaps)@
-@:spatial2(Relate,GEOSRelatePattern,char*,pattern)@
+@:spatial2(Relate,GEOSRelatePattern,str*,pattern)@
 
 @= analysis
 geom_export str
diff --git a/geom/sql/Tests/relation.sql b/geom/sql/Tests/relation.sql
--- a/geom/sql/Tests/relation.sql
+++ b/geom/sql/Tests/relation.sql
@@ -24,4 +24,6 @@
 
 SELECT a.g, b.g, Relate(a.g,b.g,'Touches') FROM geoms a, geoms b where a.g is 
not NULL and b.g is not NULL;
 
+SELECT a.g, b.g, Relate(a.g,b.g,'*F**T**F*') FROM geoms a, geoms b where a.g 
is not NULL and b.g is not NULL;
+
 DROP TABLE geoms;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list