Changeset: 53360bf22368 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=53360bf22368 Modified Files: geom/sql/Tests/basic.sql geom/sql/Tests/basic.stable.out geom/sql/Tests/geom-null-tests.sql geom/sql/Tests/geom-null-tests.stable.out Branch: sciql Log Message:
"Dimension": use double quotes to distinguish GEOM function from SciQL keyword "Dimension" is a keyword in SciQL; hence, we need to use double quotes to distinguish the GEOM function "Dimension"(). diffs (62 lines): diff --git a/geom/sql/Tests/basic.sql b/geom/sql/Tests/basic.sql --- a/geom/sql/Tests/basic.sql +++ b/geom/sql/Tests/basic.sql @@ -21,8 +21,8 @@ SELECT * FROM geoms where g is NOT NULL; -- Test changed to accomodate differences between geos versions 3.2 -- and 3.3. When geos 3.3 is installed everywhere, the test can be -- reverted and the new output approved. Also see geom-null-tests. --- SELECT Dimension(g), GeometryTypeId(g), SRID(g), Envelope(g) FROM geoms where g is not NULL; -SELECT CASE WHEN Dimension(g) IN (0,1,2) THEN 3 ELSE Dimension(g) END, GeometryTypeId(g), SRID(g), Envelope(g) FROM geoms where g is not NULL; +-- SELECT "Dimension"(g), GeometryTypeId(g), SRID(g), Envelope(g) FROM geoms where g is not NULL; +SELECT CASE WHEN "Dimension"(g) IN (0,1,2) THEN 3 ELSE "Dimension"(g) END, GeometryTypeId(g), SRID(g), Envelope(g) FROM geoms where g is not NULL; SELECT IsEmpty(g), IsSimple(g), Boundary(g) FROM geoms where g is not NULL; diff --git a/geom/sql/Tests/basic.stable.out b/geom/sql/Tests/basic.stable.out --- a/geom/sql/Tests/basic.stable.out +++ b/geom/sql/Tests/basic.stable.out @@ -48,7 +48,7 @@ Ready. [ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10))" ] [ "POLYGON ((10 10, 10 20, 20 20, 20 15, 10 10), (15 15, 15 20, 10 15, 15 15))" ] % sys., sys., sys., sys. # table_name -% or_or_=_dimension_g, geometrytypeid_g, srid_g, envelope_g # name +% or_or_=_Dimension_g, geometrytypeid_g, srid_g, envelope_g # name % int, int, int, geometry # type % 1, 1, 1, 0 # length [ 3, 0, 0, "POINT (10 10)" ] diff --git a/geom/sql/Tests/geom-null-tests.sql b/geom/sql/Tests/geom-null-tests.sql --- a/geom/sql/Tests/geom-null-tests.sql +++ b/geom/sql/Tests/geom-null-tests.sql @@ -35,9 +35,9 @@ SELECT SymDifference(g1.g, g2.g) FROM ge -- Test changed to accomodate differences between geos versions 3.2 -- and 3.3. When geos 3.3 is installed everywhere, the test can be -- reverted and the new output approved. Also see basic. --- SELECT id, Dimension(g) FROM geom WHERE id < 3; -SELECT id, CASE WHEN Dimension(g) IN (0,1,2) THEN 3 ELSE Dimension(g) END FROM geom WHERE id < 3; -SELECT id, Dimension(g) FROM geom WHERE id = 3; -- null argument, throws exception +-- SELECT id, "Dimension"(g) FROM geom WHERE id < 3; +SELECT id, CASE WHEN "Dimension"(g) IN (0,1,2) THEN 3 ELSE "Dimension"(g) END FROM geom WHERE id < 3; +SELECT id, "Dimension"(g) FROM geom WHERE id = 3; -- null argument, throws exception SELECT id, GeometryTypeId(g) FROM geom WHERE id < 3; SELECT id, GeometryTypeId(g) FROM geom WHERE id = 3; -- null argument, throws exception diff --git a/geom/sql/Tests/geom-null-tests.stable.out b/geom/sql/Tests/geom-null-tests.stable.out --- a/geom/sql/Tests/geom-null-tests.stable.out +++ b/geom/sql/Tests/geom-null-tests.stable.out @@ -146,14 +146,14 @@ Ready. [ NULL ] #SELECT id, Dimension(g) FROM geom WHERE id < 3; % sys.geom, sys. # table_name -% id, or_or_=_dimension_g # name +% id, or_or_=_Dimension_g # name % int, int # type % 1, 1 # length [ 1, 3 ] [ 2, 3 ] #SELECT id, Dimension(g) FROM geom WHERE id = 3; -- null argument, throws exception % sys.geom, sys. # table_name -% id, dimension_g # name +% id, Dimension_g # name % int, int # type % 1, 1 # length [ 3, NULL ] _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
