Changeset 2616 for trunk/regress/wkt.sql

Show
Ignore:
Timestamp:
06/04/07 16:06:28 (5 years ago)
Author:
mleslie
Message:

Added versions of functions with standard ST (Spatial Type) prefixes to any functions that were lacking them. Updated the regression tests to include the new functions.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/regress/wkt.sql

    r2332 r2616  
    1 select astext('POINT EMPTY'); 
    2 select astext('POINT(EMPTY)'); 
    3 select astext('POINT(0 0)'); 
    4 select astext('POINT((0 0))'); 
     1select ST_astext('POINT EMPTY'); 
     2select ST_astext('POINT(EMPTY)'); 
     3select ST_astext('POINT(0 0)'); 
     4select ST_astext('POINT((0 0))'); 
    55 
    6 select astext('MULTIPOINT EMPTY'); 
    7 select astext('MULTIPOINT(EMPTY)'); 
     6select ST_astext('MULTIPOINT EMPTY'); 
     7select ST_astext('MULTIPOINT(EMPTY)'); 
    88-- This is supported for backward compatibility 
    9 select astext('MULTIPOINT(0 0, 2 0)'); 
    10 select astext('MULTIPOINT((0 0), (2 0))'); 
    11 select astext('MULTIPOINT((0 0), (2 0), EMPTY)'); 
     9select ST_astext('MULTIPOINT(0 0, 2 0)'); 
     10select ST_astext('MULTIPOINT((0 0), (2 0))'); 
     11select ST_astext('MULTIPOINT((0 0), (2 0), EMPTY)'); 
    1212 
    13 select astext('LINESTRING EMPTY'); 
    14 select astext('LINESTRING(EMPTY)'); 
    15 select astext('LINESTRING(0 0, 1 1)'); 
    16 select astext('LINESTRING((0 0, 1 1))'); 
    17 select astext('LINESTRING((0 0), (1 1))'); 
     13select ST_astext('LINESTRING EMPTY'); 
     14select ST_astext('LINESTRING(EMPTY)'); 
     15select ST_astext('LINESTRING(0 0, 1 1)'); 
     16select ST_astext('LINESTRING((0 0, 1 1))'); 
     17select ST_astext('LINESTRING((0 0), (1 1))'); 
    1818 
    19 select astext('MULTILINESTRING EMPTY'); 
    20 select astext('MULTILINESTRING(EMPTY)'); 
    21 select astext('MULTILINESTRING(0 0, 2 0)'); 
    22 select astext('MULTILINESTRING((0 0, 2 0))'); 
    23 select astext('MULTILINESTRING((0 0, 2 0), (1 1, 2 2))'); 
    24 select astext('MULTILINESTRING((0 0, 2 0), (1 1, 2 2), EMPTY)'); 
    25 select astext('MULTILINESTRING((0 0, 2 0), (1 1, 2 2), (EMPTY))'); 
     19select ST_astext('MULTILINESTRING EMPTY'); 
     20select ST_astext('MULTILINESTRING(EMPTY)'); 
     21select ST_astext('MULTILINESTRING(0 0, 2 0)'); 
     22select ST_astext('MULTILINESTRING((0 0, 2 0))'); 
     23select ST_astext('MULTILINESTRING((0 0, 2 0), (1 1, 2 2))'); 
     24select ST_astext('MULTILINESTRING((0 0, 2 0), (1 1, 2 2), EMPTY)'); 
     25select ST_astext('MULTILINESTRING((0 0, 2 0), (1 1, 2 2), (EMPTY))'); 
    2626 
    27 select astext('POLYGON EMPTY'); 
    28 select astext('POLYGON(EMPTY)'); 
    29 select astext('POLYGON((0 0,1 0,1 1,0 1,0 0))'); 
    30 select astext('POLYGON((0 0,10 0,10 10,0 10,0 0),(2 2,2 5,5 5,5 2,2 2))'); 
     27select ST_astext('POLYGON EMPTY'); 
     28select ST_astext('POLYGON(EMPTY)'); 
     29select ST_astext('POLYGON((0 0,1 0,1 1,0 1,0 0))'); 
     30select ST_astext('POLYGON((0 0,10 0,10 10,0 10,0 0),(2 2,2 5,5 5,5 2,2 2))'); 
    3131 
    32 select astext('MULTIPOLYGON EMPTY'); 
    33 select astext('MULTIPOLYGON(EMPTY)'); 
    34 select astext('MULTIPOLYGON((EMPTY))'); 
    35 select astext('MULTIPOLYGON(((0 0,10 0,10 10,0 10,0 0),(2 2,2 5,5 5,5 2,2 2)))'); 
     32select ST_astext('MULTIPOLYGON EMPTY'); 
     33select ST_astext('MULTIPOLYGON(EMPTY)'); 
     34select ST_astext('MULTIPOLYGON((EMPTY))'); 
     35select ST_astext('MULTIPOLYGON(((0 0,10 0,10 10,0 10,0 0),(2 2,2 5,5 5,5 2,2 2)))'); 
    3636 
    37 select astext('GEOMETRYCOLLECTION EMPTY'); 
     37select ST_astext('GEOMETRYCOLLECTION EMPTY'); 
    3838-- This is supported for backward compatibility 
    39 select astext('GEOMETRYCOLLECTION(EMPTY)'); 
    40 select astext('GEOMETRYCOLLECTION((EMPTY))'); 
     39select ST_astext('GEOMETRYCOLLECTION(EMPTY)'); 
     40select ST_astext('GEOMETRYCOLLECTION((EMPTY))');