Revision 44644 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/test/java/org/gvsig/fmap/dal/store/SQLBuilderTest.java

View differences:

SQLBuilderTest.java
3 3
import org.apache.commons.lang3.ArrayUtils;
4 4
import org.cresques.cts.IProjection;
5 5
import org.gvsig.expressionevaluator.ExpressionBuilder;
6
import org.gvsig.expressionevaluator.GeometryExpressionBuilder;
6 7
import org.gvsig.fmap.crs.CRSFactory;
7 8
import org.gvsig.fmap.dal.SQLBuilder;
8 9
import org.gvsig.fmap.dal.SQLBuilder.Privilege;
......
37 38
        limit.addVertex(0, 0);
38 39
        
39 40
        SQLBuilder sqlbuilder = createSQLBuilder();
40
        ExpressionBuilder expbuilder = sqlbuilder.expression();
41
        GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
41 42
        
42 43
        sqlbuilder.select().column().value(
43 44
            expbuilder.as_geometry(
......
308 309
        IProjection proj = CRSFactory.getCRS("EPSG:4326");
309 310

  
310 311
        SQLBuilder sqlbuilder = createSQLBuilder();
311
        ExpressionBuilder expbuilder = sqlbuilder.expression();
312
        GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
312 313

  
313 314
        sqlbuilder.insert().table().database("master").schema("dbo").name("test1");
314 315
        sqlbuilder.insert().column().name("id").with_value(expbuilder.parameter("id"));
315 316
        sqlbuilder.insert().column().name("name").with_value(expbuilder.parameter("name"));
316
        sqlbuilder.insert().column().name("geom").with_value(expbuilder.parameter("geom").as_geometry_variable().srs(proj));
317
        sqlbuilder.insert().column().name("geom").with_value(expbuilder.parameter("geom").as_variable().srs(proj));
317 318
        
318 319
        // INSERT INTO "master"."dbo"."test1" ( "id", "name", "geom" ) VALUES ( ?, ?, ST_GeomFromText(?, (4326)) )
319 320
        
......
339 340
        IProjection proj = CRSFactory.getCRS("EPSG:4326");
340 341

  
341 342
        SQLBuilder sqlbuilder = createSQLBuilder();
342
        ExpressionBuilder expbuilder = sqlbuilder.expression();
343
        GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
343 344

  
344 345
        sqlbuilder.insert().table().database("master").schema("dbo").name("test1");
345 346
        sqlbuilder.insert().column().name("id").with_value(expbuilder.parameter("id"));
346 347
        sqlbuilder.insert().column().name("name").with_value(expbuilder.parameter("name"));
347
        sqlbuilder.insert().column().name("geom").with_value(expbuilder.parameter("geom").as_geometry_variable().srs(expbuilder.parameter().value(proj)));
348
        sqlbuilder.insert().column().name("geom").with_value(expbuilder.parameter("geom").as_variable().srs(expbuilder.parameter().value(proj)));
348 349
        
349 350
        System.out.println("# Test:: testPerformInserts2");
350 351
        System.out.println("# SQL:: " + sqlbuilder.toString());
......
368 369
        IProjection proj = CRSFactory.getCRS("EPSG:4326");
369 370

  
370 371
        SQLBuilder sqlbuilder = createSQLBuilder();
371
        ExpressionBuilder expbuilder = sqlbuilder.expression();
372
        GeometryExpressionBuilder expbuilder = sqlbuilder.expression();
372 373

  
373 374
        sqlbuilder.update().table().database("master").schema("dbo").name("test1");
374 375
        sqlbuilder.update().where().and(
......
379 380
        );
380 381
        sqlbuilder.update().column().name("name").with_value(expbuilder.parameter("name"));
381 382
        sqlbuilder.update().column().name("geom").with_value(
382
                expbuilder.parameter("geom").as_geometry_variable()
383
                expbuilder.parameter("geom").as_variable()
383 384
                        .srs(expbuilder.parameter().value(proj)) 
384 385
        );
385 386

  

Also available in: Unified diff