Merge pull request #1445 from katzyn/geometry

Use PostGIS-compatible format for SRID-only constraint in GEOMETRY

h2/src/docsrc/help/help.csv

@@ -3037,8 +3037,15 @@ ENUM('clubs', 'diamonds', 'hearts', 'spades')
 "
 "Data Types","GEOMETRY Type","
 GEOMETRY
-    [({ sridInt | { {POINT|LINESTRING|POLYGON|MULTIPOINT|MULTILINESTRING
-    |MULTIPOLYGON|GEOMETRYCOLLECTION} [Z|M|ZM] [, sridInt]} })]
+    [({ GEOMETRY |
+    { POINT
+    | LINESTRING
+    | POLYGON
+    | MULTIPOINT
+    | MULTILINESTRING
+    | MULTIPOLYGON
+    | GEOMETRYCOLLECTION } [Z|M|ZM]}
+    [, sridInt] )]
 ","
 A spatial geometry type.
 If additional constraints are not specified this type accepts all supported types of geometries.
@@ -3046,8 +3053,8 @@ A constraint with required geometry type and dimension system can be set by spec
 dimension system. A whitespace between them is optional.
 2D dimension system does not have a name and assumed if only a geometry type name is specified.
 POINT means 2D point, POINT Z or POINTZ means 3D point.
+GEOMETRY constraint means no restrictions on type or dimension system of geometry.
 A constraint with required spatial reference system identifier (SRID) can be set by specifying this identifier.
-Both constraints for type and SRID can be specified together.
 
 Mapped to ""org.locationtech.jts.geom.Geometry"" if JTS library is in classpath and to ""java.lang.String"" otherwise.
 May be represented in textual format using the WKT (well-known text) or EWKT (extended well-known text) format.
@@ -3064,7 +3071,7 @@ GEOMETRY
 GEOMETRY(POINT)
 GEOMETRY(POINT Z)
 GEOMETRY(POINT Z, 4326)
-GEOMETRY(4326)
+GEOMETRY(GEOMETRY, 4326)
 "
 
 "Data Types","INTERVAL Type","

h2/src/main/org/h2/command/Parser.java

@@ -5049,7 +5049,10 @@ public class Parser {
             if (extTypeInfo == null) {
                 if (readIf(OPEN_PAREN)) {
                     int type = 0;
-                    if (currentTokenType == IDENTIFIER && !currentTokenQuoted) {
+                    if (currentTokenType != IDENTIFIER || currentTokenQuoted) {
+                        throw getSyntaxError();
+                    }
+                    if (!readIf("GEOMETRY")) {
                         try {
                             type = EWKTUtils.parseGeometryType(currentToken);
                             read();
@@ -5062,7 +5065,7 @@ public class Parser {
                         }
                     }
                     Integer srid = null;
-                    if (type == 0 || readIf(COMMA)) {
+                    if (readIf(COMMA)) {
                         srid = readInt();
                     }
                     read(CLOSE_PAREN);

h2/src/main/org/h2/value/ExtTypeInfoGeometry.java

@@ -24,14 +24,13 @@ public final class ExtTypeInfoGeometry extends ExtTypeInfo {
         }
         StringBuilder builder = new StringBuilder();
         builder.append('(');
-        if (type != 0) {
+        if (type == 0) {
+            builder.append("GEOMETRY");
+        } else {
             builder.append(EWKTUtils.formatGeometryTypeAndDimensionSystem(type));
         }
         if (srid != null) {
-            if (type != 0) {
-                builder.append(", ");
-            }
-            builder.append((int) srid);
+            builder.append(", ").append((int) srid);
         }
         return builder.append(')').toString();
     }

h2/src/test/org/h2/test/scripts/datatypes/geometry.sql

@@ -3,7 +3,7 @@
 -- Initial Developer: H2 Group
 --
 
-CREATE TABLE TEST(G GEOMETRY, G_S GEOMETRY(1), P GEOMETRY(POINT), P_S GEOMETRY(POINT, 1),
+CREATE TABLE TEST(G GEOMETRY, G_S GEOMETRY(GEOMETRY, 1), P GEOMETRY(POINT), P_S GEOMETRY(POINT, 1),
     PZ1 GEOMETRY(POINT Z), PZ2 GEOMETRY(POINTZ), PZ1_S GEOMETRY(POINT Z, 1), PZ2_S GEOMETRY(POINTZ, 1),
     PM GEOMETRY(POINT M), PZM GEOMETRY(POINT ZM), PZM_S GEOMETRY(POINT ZM, -100),
     LS GEOMETRY(LINESTRING), PG GEOMETRY(POLYGON),
@@ -24,7 +24,7 @@ SELECT COLUMN_NAME, TYPE_NAME, COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS
 > COLUMN_NAME TYPE_NAME COLUMN_TYPE
 > ----------- --------- ----------------------------
 > G           GEOMETRY  GEOMETRY
-> G_S         GEOMETRY  GEOMETRY(1)
+> G_S         GEOMETRY  GEOMETRY(GEOMETRY, 1)
 > P           GEOMETRY  GEOMETRY(POINT)
 > P_S         GEOMETRY  GEOMETRY(POINT, 1)
 > PZ1         GEOMETRY  GEOMETRY(POINT Z)