Revision 45022

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/test/java/org/gvsig/fmap/dal/store/h2/H2SpatialSQLBuilderTest.java
36 36
    }
37 37

  
38 38
    private SQLBuilder createSQLBuilder() {
39
        return new H2SpatialSQLBuilder(new H2SpatialHelper(null));
39
        return new H2SpatialSQLBuilder(new H2SpatialHelper());
40 40
    }
41 41
    
42 42
    public void testCalulateEnvelopeOfColumn() throws Exception {
......
171 171
    public void testCreateTable() throws Exception {
172 172
        SQLBuilder sqlbuilder = createSQLBuilder();
173 173
        ExpressionBuilder expbuilder = sqlbuilder.expression();
174
        
175
        IProjection proj = CRSFactory.getCRS("EPSG:4326");
174 176

  
175 177
        sqlbuilder.create_table().table().database("master").schema("dbo").name("test1");
176 178
        sqlbuilder.create_table().add_column(
......
197 199
                true,
198 200
                0
199 201
        );
200
        sqlbuilder.create_table().add_column(
201
                "geom",
202
                DataTypes.GEOMETRY,
203
                0,
204
                0,
205
                0,
206
                false,
207
                false,
208
                true,
209
                false,
210
                null
211
        );
212 202

  
203
        sqlbuilder.create_table().add_geometry_column("geom", Geometry.TYPES.MULTIPOLYGON, Geometry.SUBTYPES.GEOM2D, proj, true, true);
204

  
213 205
        
214 206
        // CREATE TABLE "test1" ("name" VARCHAR(45) DEFAULT NULL, "id" INTEGER PRIMARY KEY AUTO_INCREMENT DEFAULT '0' NOT NULL, "geom" GEOMETRY ); ALTER TABLE "test1" ADD CONSTRAINT IF NOT EXISTS "constraint_test1_geom_dim" CHECK ST_CoordDim("geom") = 2
215 207
        System.out.println("# Test:: testCreateTable");
......
217 209
        System.out.println("# Variables:: " + ArrayUtils.toString(sqlbuilder.variables_names()));
218 210
        System.out.println("# Parametros:: " + ArrayUtils.toString(sqlbuilder.parameters_names()));
219 211
        assertEquals(
220
                "CREATE TABLE \"dbo\".\"test1\" (\"name\" VARCHAR(45) DEFAULT NULL, \"id\" INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL, \"geom\" GEOMETRY(1) CHECK NVL2(\"geom\", ST_GeometryTypeCode(\"geom\") = 0 AND ST_CoordDim(\"geom\") = 2, TRUE) )",
212
                "CREATE TABLE \"dbo\".\"test1\" (\"name\" VARCHAR(45) DEFAULT NULL, \"id\" INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL, \"geom\" GEOMETRY(6) CHECK NVL2(\"geom\", ST_GeometryTypeCode(\"geom\") = 6 AND ST_CoordDim(\"geom\") = 2 AND ST_SRID(\"geom\") = 4326, TRUE) )",
221 213
                sqlbuilder.toString()
222 214
        );
223 215
        assertEquals(
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/main/java/org/gvsig/fmap/dal/store/h2/H2SpatialSQLBuilder.java
459 459
        if( type!=DataTypes.GEOMETRY ) {
460 460
            return super.sqltype(type, size, precision, scale, geomtype, geomSubtype);
461 461
        }
462
        return "GEOMETRY(1)";
462
        return "GEOMETRY("+sqlgeometrytype(geomtype, geomSubtype)+")";
463 463
    }
464 464
    
465 465
    @Override

Also available in: Unified diff