Revision 44644 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

View differences:

H2SpatialSQLBuilderTest.java
2 2

  
3 3
import junit.framework.TestCase;
4 4
import org.apache.commons.lang3.ArrayUtils;
5
import org.apache.commons.lang3.StringUtils;
6 5
import org.cresques.cts.IProjection;
7 6
import org.gvsig.expressionevaluator.ExpressionBuilder;
7
import org.gvsig.expressionevaluator.GeometryExpressionBuilder;
8 8
import org.gvsig.fmap.crs.CRSFactory;
9 9
import org.gvsig.fmap.dal.SQLBuilder;
10 10
import org.gvsig.fmap.dal.SQLBuilder.Privilege;
11 11
import org.gvsig.fmap.dal.feature.spi.SQLBuilderBase;
12 12
import org.gvsig.fmap.dal.store.jdbc2.OperationsFactory.TableReference;
13
import static org.gvsig.fmap.dal.store.jdbc2.spi.JDBCSQLBuilderBase.PROP_TABLE;
14 13
import org.gvsig.fmap.dal.store.jdbc2.spi.operations.OperationsFactoryBase;
15 14
import org.gvsig.fmap.geom.DataTypes;
16 15
import org.gvsig.fmap.geom.Geometry;
......
46 45
        String columnName = "the_geom";
47 46
        
48 47
        SQLBuilder sqlbuilder = createSQLBuilder();
49
        ExpressionBuilder expbuilder = sqlbuilder.expression();
48
        GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
50 49
        
51 50
        sqlbuilder.select().column().value(
52 51
            expbuilder.as_geometry(
......
96 95
        limit.addVertex(0, 0);
97 96
        
98 97
        SQLBuilder sqlbuilder = createSQLBuilder();
99
        ExpressionBuilder expbuilder = sqlbuilder.expression();
98
        GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
100 99
        
101 100
        sqlbuilder.select().column().value(
102 101
            expbuilder.as_geometry(
......
365 364
        IProjection proj = CRSFactory.getCRS("EPSG:4326");
366 365

  
367 366
        SQLBuilder sqlbuilder = createSQLBuilder();
368
        ExpressionBuilder expbuilder = sqlbuilder.expression();
367
        GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
369 368

  
370 369
        sqlbuilder.insert().table().database("master").schema("dbo").name("test1");
371 370
        sqlbuilder.insert().column().name("id").with_value(expbuilder.parameter("id"));
......
394 393
        IProjection proj = CRSFactory.getCRS("EPSG:4326");
395 394

  
396 395
        SQLBuilder sqlbuilder = createSQLBuilder();
397
        ExpressionBuilder expbuilder = sqlbuilder.expression();
396
        GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
398 397

  
399 398
        sqlbuilder.insert().table().database("master").schema("dbo").name("test1");
400 399
        sqlbuilder.insert().column().name("id").with_value(expbuilder.parameter("id"));
......
423 422
        IProjection proj = CRSFactory.getCRS("EPSG:4326");
424 423

  
425 424
        SQLBuilder sqlbuilder = createSQLBuilder();
426
        ExpressionBuilder expbuilder = sqlbuilder.expression();
425
        GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
427 426

  
428 427
        sqlbuilder.update().table().database("master").schema("dbo").name("test1");
429 428
        sqlbuilder.update().where().and(
......
459 458
        IProjection proj = CRSFactory.getCRS("EPSG:4326");
460 459

  
461 460
        SQLBuilder sqlbuilder = createSQLBuilder();
462
        ExpressionBuilder expbuilder = sqlbuilder.expression();
461
        GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
463 462

  
464 463
        sqlbuilder.update().table().database("master").schema("dbo").name("test1");
465 464
        sqlbuilder.update().where().and(

Also available in: Unified diff