Revision 45694 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.mdb/src/test/java/org/gvsig/fmap/dal/store/mdb/MDBSQLBuilderTest.java

View differences:

MDBSQLBuilderTest.java
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 org.gvsig.fmap.dal.store.jdbc2.spi.FakeConnectionParameters;
13 14
import org.gvsig.fmap.dal.store.jdbc2.spi.operations.OperationsFactoryBase;
14 15
import org.gvsig.fmap.geom.DataTypes;
15 16
import org.gvsig.fmap.geom.Geometry;
......
36 37
    }
37 38

  
38 39
    private SQLBuilder createSQLBuilder() {
39
        return new MDBSQLBuilder(new MDBHelper(null));
40
        return new MDBSQLBuilder(new MDBHelper(new FakeConnectionParameters()));
40 41
    }
41 42
    
42 43
    public void testCalulateEnvelopeOfColumn() throws Exception {
......
69 70
        System.out.println("# SQL:: " + sqlbuilder.toString());
70 71
        System.out.println("# Variables:: " + ArrayUtils.toString(sqlbuilder.variables_names()));
71 72
        System.out.println("# Parametros:: " + ArrayUtils.toString(sqlbuilder.parameters_names()));
73
//                "SELECT NVL2(ST_Extent(\"the_geom\"),ST_AsBinary(ST_Extent(\"the_geom\")),NULL) FROM \"dbo\".\"test1\" WHERE ( (\"the_geom\") IS NOT NULL )",
72 74
        assertEquals(
73
                "SELECT NVL2(ST_Extent(\"the_geom\"),ST_AsBinary(ST_Extent(\"the_geom\")),NULL) FROM \"dbo\".\"test1\" WHERE ( (\"the_geom\") IS NOT NULL )",
75
                "SELECT ST_AsBinary(ST_ExtentAggregate([the_geom])) FROM [test1] WHERE ( ([the_geom]) IS NOT NULL )",
74 76
                sqlbuilder.toString()
75 77
        );
76 78
        assertEquals(
......
121 123
        System.out.println("# SQL:: " + sqlbuilder.toString());
122 124
        System.out.println("# Variables:: " + ArrayUtils.toString(sqlbuilder.variables_names()));
123 125
        System.out.println("# Parametros:: " + ArrayUtils.toString(sqlbuilder.parameters_names()));
126
//                "SELECT NVL2(ST_Extent(\"the_geom\"),ST_AsBinary(ST_Extent(\"the_geom\")),NULL) AS \"envelope\" FROM \"dbo\".\"test1\" WHERE (( ((ST_Envelope(\"the_geom\")) && (ST_GeomFromWKB((x'000000000300000001000000050000000000000000000000000000000000000000000000004059000000000000405900000000000040590000000000004059000000000000000000000000000000000000000000000000000000000000'), (4326)))) AND ST_Intersects((ST_Envelope(\"the_geom\")),(ST_GeomFromWKB((x'000000000300000001000000050000000000000000000000000000000000000000000000004059000000000000405900000000000040590000000000004059000000000000000000000000000000000000000000000000000000000000'), (4326))) )) AND x = 27)",
124 127
        assertEquals(
125
                "SELECT NVL2(ST_Extent(\"the_geom\"),ST_AsBinary(ST_Extent(\"the_geom\")),NULL) AS \"envelope\" FROM \"dbo\".\"test1\" WHERE (( ((ST_Envelope(\"the_geom\")) && (ST_GeomFromWKB((x'000000000300000001000000050000000000000000000000000000000000000000000000004059000000000000405900000000000040590000000000004059000000000000000000000000000000000000000000000000000000000000'), (4326)))) AND ST_Intersects((ST_Envelope(\"the_geom\")),(ST_GeomFromWKB((x'000000000300000001000000050000000000000000000000000000000000000000000000004059000000000000405900000000000040590000000000004059000000000000000000000000000000000000000000000000000000000000'), (4326))) )) AND x = 27)",
128
                "SELECT ST_AsBinary(ST_ExtentAggregate([the_geom])) AS [envelope] FROM [test1] WHERE (ST_Intersects((ST_Envelope([the_geom])), (x'000000000300000001000000050000000000000000000000000000000000000000000000004059000000000000405900000000000040590000000000004059000000000000000000000000000000000000000000000000000000000000')) AND x = 27)",
126 129
                sqlbuilder.toString()
127 130
        );
128 131
        assertEquals(
......
154 157
        //# Variables:: []
155 158
        //# Parametros:: []
156 159

  
160
//                "SELECT COUNT(*) FROM \"dbo\".\"test1\" WHERE pp = 200",
157 161
        assertEquals(
158
                "SELECT COUNT(*) FROM \"dbo\".\"test1\" WHERE pp = 200",
162
                "SELECT COUNT(*) FROM [test1] WHERE pp = 200",
159 163
                sqlbuilder.toString()
160 164
        );
161 165
        assertEquals(
......
216 220
        System.out.println("# SQL:: " + sqlbuilder.toString());
217 221
        System.out.println("# Variables:: " + ArrayUtils.toString(sqlbuilder.variables_names()));
218 222
        System.out.println("# Parametros:: " + ArrayUtils.toString(sqlbuilder.parameters_names()));
223
//                "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) )",
219 224
        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) )",
225
                "CREATE TABLE [test1] ([name] VARCHAR(45) DEFAULT NULL, [id] INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL, [geom] CLOB DEFAULT NULL )",
221 226
                sqlbuilder.toString()
222 227
        );
223 228
        assertEquals(
......
242 247
        System.out.println("# SQL:: " + sqlbuilder.toString());
243 248
        System.out.println("# Variables:: " + ArrayUtils.toString(sqlbuilder.variables_names()));
244 249
        System.out.println("# Parametros:: " + ArrayUtils.toString(sqlbuilder.parameters_names()));
250
//                "DROP TABLE \"dbo\".\"test1\"",
245 251
        assertEquals(
246
                "DROP TABLE \"dbo\".\"test1\"",
252
                "DROP TABLE [test1]",
247 253
                sqlbuilder.toString()
248 254
        );
249 255
        assertEquals(
......
311 317
        //# Variables:: []
312 318
        //# Parametros:: []        
313 319
        
320
//                "SELECT * FROM \"dbo\".\"test1\" LIMIT 1",
314 321
        assertEquals(
315
                "SELECT * FROM \"dbo\".\"test1\" LIMIT 1",
322
                "SELECT * FROM [test1] LIMIT 1",
316 323
                sqlbuilder.toString()
317 324
        );
318 325
        assertEquals(
......
349 356
        System.out.println("# SQL:: " + sqlbuilder.toString());
350 357
        System.out.println("# Variables:: " + ArrayUtils.toString(sqlbuilder.variables_names()));
351 358
        System.out.println("# Parametros:: " + ArrayUtils.toString(sqlbuilder.parameters_names()));
359
//                "DELETE FROM \"dbo\".\"test1\" WHERE (( (\"id1\") = (?) ) AND ( (\"id2\") = (?) ))",
352 360
        assertEquals(
353
                "DELETE FROM \"dbo\".\"test1\" WHERE (( (\"id1\") = (?) ) AND ( (\"id2\") = (?) ))",
361
                "DELETE FROM [test1] WHERE (( ([id1]) = (?) ) AND ( ([id2]) = (?) ))",
354 362
                sqlbuilder.toString()
355 363
        );
356 364
        assertEquals(
......
378 386
        System.out.println("# SQL:: " + sqlbuilder.toString());
379 387
        System.out.println("# Variables:: " + ArrayUtils.toString(sqlbuilder.variables_names()));
380 388
        System.out.println("# Parametros:: " + ArrayUtils.toString(sqlbuilder.parameters_names()));
389
//                "INSERT INTO \"dbo\".\"test1\" ( \"id\", \"name\", \"geom\" ) VALUES ( ?, ?, ST_GeomFromWKB((?), (4326)) )",
381 390
        assertEquals(
382
                "INSERT INTO \"dbo\".\"test1\" ( \"id\", \"name\", \"geom\" ) VALUES ( ?, ?, ST_GeomFromWKB((?), (4326)) )",
391
                "INSERT INTO [test1] ( [id], [name], [geom] ) VALUES ( ?, ?, ? )",
383 392
                sqlbuilder.toString()
384 393
        );
385 394
        assertEquals(
......
407 416
        System.out.println("# SQL:: " + sqlbuilder.toString());
408 417
        System.out.println("# Variables:: " + ArrayUtils.toString(sqlbuilder.variables_names()));
409 418
        System.out.println("# Parametros:: " + ArrayUtils.toString(sqlbuilder.parameters_names()));
419
//                "INSERT INTO \"dbo\".\"test1\" ( \"id\", \"name\", \"geom\" ) VALUES ( ?, ?, ST_GeomFromWKB((?), (4326)) )",
410 420
        assertEquals(
411
                "INSERT INTO \"dbo\".\"test1\" ( \"id\", \"name\", \"geom\" ) VALUES ( ?, ?, ST_GeomFromWKB((?), (4326)) )",
421
                "INSERT INTO [test1] ( [id], [name], [geom] ) VALUES ( ?, ?, ? )",
412 422
                sqlbuilder.toString()
413 423
        );
414 424
        assertEquals(
......
443 453
        System.out.println("# SQL:: " + sqlbuilder.toString());
444 454
        System.out.println("# Variables:: " + ArrayUtils.toString(sqlbuilder.variables_names()));
445 455
        System.out.println("# Parametros:: " + ArrayUtils.toString(sqlbuilder.parameters_names()));
456
//                "UPDATE \"dbo\".\"test1\" SET \"name\" = ?, \"geom\" = ST_GeomFromWKB((?), (4326)) WHERE ( (\"id\") = (?) )",
446 457
        assertEquals(
447
                "UPDATE \"dbo\".\"test1\" SET \"name\" = ?, \"geom\" = ST_GeomFromWKB((?), (4326)) WHERE ( (\"id\") = (?) )",
458
                "UPDATE [test1] SET [name] = ?, [geom] = ? WHERE ( ([id]) = (?) )",
448 459
                sqlbuilder.toString()
449 460
        );
450 461
        assertEquals(
......
480 491
        System.out.println("# SQL:: " + sqlbuilder.toString());
481 492
        System.out.println("# Variables:: " + ArrayUtils.toString(sqlbuilder.variables_names()));
482 493
        System.out.println("# Parametros:: " + ArrayUtils.toString(sqlbuilder.parameters_names()));
494
//                "UPDATE \"dbo\".\"test1\" SET \"name\" = ?, \"geom\" = ST_GeomFromWKB((?), (?)) WHERE ( (\"id\") = (?) )",
483 495
        assertEquals(
484
                "UPDATE \"dbo\".\"test1\" SET \"name\" = ?, \"geom\" = ST_GeomFromWKB((?), (?)) WHERE ( (\"id\") = (?) )",
496
                "UPDATE [test1] SET [name] = ?, [geom] = ? WHERE ( ([id]) = (?) )",
485 497
                sqlbuilder.toString()
486 498
        );
487 499
        assertEquals(

Also available in: Unified diff