MonetDB: geo - Recognize nil:str when converting text to wkb.

[Sjoerd Mullender]

Changeset: 58a09156d142 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=58a09156d142
Modified Files:
        geom/BugTracker/Tests/copy_into_mbr.3492.stable.out
        geom/monetdb5/geom.c
Branch: geo
Log Message:

Recognize nil:str when converting text to wkb.


diffs (26 lines):

diff --git a/geom/BugTracker/Tests/copy_into_mbr.3492.stable.out 
b/geom/BugTracker/Tests/copy_into_mbr.3492.stable.out
--- a/geom/BugTracker/Tests/copy_into_mbr.3492.stable.out
+++ b/geom/BugTracker/Tests/copy_into_mbr.3492.stable.out
@@ -51,7 +51,7 @@ Ready.
 [ 4,   NULL,   NULL    ]
 [ 5,   NULL,   NULL    ]
 #UPDATE geom SET b = MBR(g);
-[ 4    ]
+[ 5    ]
 #SELECT * FROM geom ORDER BY id;
 % sys.geom,    sys.geom,       sys.geom # table_name
 % id,  g,      b # name
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -2250,6 +2250,10 @@ str wkbFromText(wkb **geomWKB, str *geom
        str ex;
 
        *geomWKB = NULL;
+       if (strcmp(*geomWKT, str_nil) == 0) {
+               *geomWKB = wkb_nil;
+               return MAL_SUCCEED;
+       }
        if (wkbFROMSTR_withSRID(*geomWKT, &len, geomWKB, *srid) && 
                        (wkb_isnil(*geomWKB) || *tpe==0 || *tpe == 
wkbGeometryCollection || ((te = ((*((*geomWKB)->data + 1) & 0x0f)))+(*tpe>2)) 
== *tpe)) {
                return MAL_SUCCEED;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list