Revision 916 org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/test/java/org/gvsig/oracle/dal/OracleSQLBuilderTest.java

View differences:

OracleSQLBuilderTest.java
72 72
        System.out.println("# Variables:: " + ArrayUtils.toString(sqlbuilder.variables_names()));
73 73
        System.out.println("# Parametros:: " + ArrayUtils.toString(sqlbuilder.parameters_names()));
74 74
        assertEquals(
75
                "SELECT NVL2((SDO_AGGR_MBR(\"geom\")),(SDO_AGGR_MBR(\"geom\")).Get_WKB(),NULL) FROM \"dbo\".\"test1\" WHERE ( (\"geom\") IS NOT NULL )", 
75
                "SELECT NVL2((SDO_AGGR_MBR(\"geom\")),(SDO_AGGR_MBR(\"geom\")).Get_WKB(),NULL) FROM \"dbo\".\"TEST1\" WHERE ( (\"geom\") IS NOT NULL )", 
76 76
                sqlbuilder.toString()
77 77
        );
78 78
        assertEquals(
......
125 125
        System.out.println("# Variables:: " + ArrayUtils.toString(sqlbuilder.variables_names()));
126 126
        System.out.println("# Parametros:: " + ArrayUtils.toString(sqlbuilder.parameters_names()));
127 127
        assertEquals(
128
                "SELECT NVL2((SDO_AGGR_MBR(\"the_geom\")),(SDO_AGGR_MBR(\"the_geom\")).Get_WKB(),NULL) \"envelope\" FROM \"dbo\".\"test1\" WHERE ( ((SDO_RELATE(SDO_GEOM.SDO_MBR(\"the_geom\"), SDO_GEOMETRY((TO_BLOB(HEXTORAW('000000000300000001000000050000000000000000000000000000000000000000000000004059000000000000405900000000000040590000000000004059000000000000000000000000000000000000000000000000000000000000'))), (4326)), 'mask=ANYINTERACT') = 'TRUE')) AND (x = 27) )",
128
                "SELECT NVL2((SDO_AGGR_MBR(\"the_geom\")),(SDO_AGGR_MBR(\"the_geom\")).Get_WKB(),NULL) \"envelope\" FROM \"dbo\".\"TEST1\" WHERE ( ((SDO_RELATE(SDO_GEOM.SDO_MBR(\"the_geom\"), SDO_GEOMETRY((TO_BLOB(HEXTORAW('000000000300000001000000050000000000000000000000000000000000000000000000004059000000000000405900000000000040590000000000004059000000000000000000000000000000000000000000000000000000000000'))), (4326)), 'mask=ANYINTERACT') = 'TRUE')) AND (x = 27) )",
129 129
                sqlbuilder.toString()
130 130
        );
131 131
        assertEquals(
......
158 158
        //# Parametros:: []
159 159

  
160 160
        assertEquals(
161
                "SELECT COUNT(*) FROM \"dbo\".\"test1\" WHERE pp = 200",
161
                "SELECT COUNT(*) FROM \"dbo\".\"TEST1\" WHERE pp = 200",
162 162
                sqlbuilder.toString()
163 163
        );
164 164
        assertEquals(
......
246 246
        System.out.println("# Variables:: " + ArrayUtils.toString(sqlbuilder.variables_names()));
247 247
        System.out.println("# Parametros:: " + ArrayUtils.toString(sqlbuilder.parameters_names()));
248 248
        assertEquals(
249
                "DROP TABLE \"dbo\".\"test1\"",
249
                "DROP TABLE \"dbo\".\"TEST1\"",
250 250
                sqlbuilder.toString()
251 251
        );
252 252
        assertEquals(
......
260 260
    }
261 261
    
262 262
    public void testFetchFeatureProviderByReference() throws Exception {
263
        SQLBuilder sqlbuilder = new SQLBuilderBase();
263
        SQLBuilder sqlbuilder = createSQLBuilder();
264 264
        ExpressionBuilder expbuilder = sqlbuilder.expression();
265 265
        
266 266
        String value = "yoyo";
......
276 276
        );
277 277
        sqlbuilder.select().limit(1);
278 278

  
279
        // SELECT "name", "id", ST_AsBinary("geom") FROM "master"."dbo"."test1" WHERE ( ("name") = (?) ) LIMIT 1
279
        // SELECT "name", "id", ST_AsBinary("geom") FROM "master"."dbo"."TEST1" WHERE ( ("name") = (?) ) LIMIT 1
280 280

  
281 281
        System.out.println("# Test:: testFetchFeatureProviderByReference");
282 282
        System.out.println("# SQL:: " + sqlbuilder.toString());
283 283
        System.out.println("# Variables:: " + ArrayUtils.toString(sqlbuilder.variables_names()));
284 284
        System.out.println("# Parametros:: " + ArrayUtils.toString(sqlbuilder.parameters_names()));
285 285
        assertEquals(
286
                "SELECT \"name\", \"id\", ST_AsBinary(\"geom\") FROM \"master\".\"dbo\".\"test1\" WHERE ( (\"name\") = (?) ) LIMIT 1",
286
                "SELECT \"name\", \"id\", NVL2((\"geom\"),(\"geom\").Get_WKB(),NULL) FROM \"dbo\".\"TEST1\" WHERE ( (\"name\") = (?) ) AND  ROWNUM <= 1",
287 287
                sqlbuilder.toString()
288 288
        );
289 289
        assertEquals(
......
315 315
        //# Parametros:: []        
316 316
        
317 317
        assertEquals(
318
                "SELECT * FROM \"dbo\".\"test1\" WHERE  ROWNUM <= 1",
318
                "SELECT * FROM \"dbo\".\"TEST1\" WHERE  ROWNUM <= 1",
319 319
                sqlbuilder.toString()
320 320
        );
321 321
        assertEquals(
......
351 351
        System.out.println("# Variables:: " + ArrayUtils.toString(sqlbuilder.variables_names()));
352 352
        System.out.println("# Parametros:: " + ArrayUtils.toString(sqlbuilder.parameters_names()));
353 353
        assertEquals(
354
                "DELETE FROM \"dbo\".\"test1\" WHERE ( (( (\"id1\") = (?) )) AND (( (\"id2\") = (?) )) )",
354
                "DELETE FROM \"dbo\".\"TEST1\" WHERE ( (( (\"id1\") = (?) )) AND (( (\"id2\") = (?) )) )",
355 355
                sqlbuilder.toString()
356 356
        );
357 357
        assertEquals(
......
380 380
        System.out.println("# Variables:: " + ArrayUtils.toString(sqlbuilder.variables_names()));
381 381
        System.out.println("# Parametros:: " + ArrayUtils.toString(sqlbuilder.parameters_names()));
382 382
        assertEquals(
383
                "INSERT INTO \"dbo\".\"test1\" ( \"id\", \"name\", \"geom\" ) VALUES ( ?, ?, NVL2((?),SDO_GEOMETRY((?), (4326)),NULL) )",
383
                "INSERT INTO \"dbo\".\"TEST1\" ( \"id\", \"name\", \"geom\" ) VALUES ( ?, ?, NVL2((?),SDO_GEOMETRY((?), (4326)),NULL) )",
384 384
                sqlbuilder.toString()
385 385
        );
386 386
        assertEquals(
......
409 409
        System.out.println("# Variables:: " + ArrayUtils.toString(sqlbuilder.variables_names()));
410 410
        System.out.println("# Parametros:: " + ArrayUtils.toString(sqlbuilder.parameters_names()));
411 411
        assertEquals(
412
                "INSERT INTO \"dbo\".\"test1\" ( \"id\", \"name\", \"geom\" ) VALUES ( ?, ?, NVL2((?),SDO_GEOMETRY((?), (4326)),NULL) )",
412
                "INSERT INTO \"dbo\".\"TEST1\" ( \"id\", \"name\", \"geom\" ) VALUES ( ?, ?, NVL2((?),SDO_GEOMETRY((?), (4326)),NULL) )",
413 413
                sqlbuilder.toString()
414 414
        );
415 415
        assertEquals(
......
445 445
        System.out.println("# Variables:: " + ArrayUtils.toString(sqlbuilder.variables_names()));
446 446
        System.out.println("# Parametros:: " + ArrayUtils.toString(sqlbuilder.parameters_names()));
447 447
        assertEquals(
448
                "UPDATE \"dbo\".\"test1\" SET \"name\" = ?, \"geom\" = NVL2((?),SDO_GEOMETRY((?), (4326)),NULL) WHERE ( (\"id\") = (?) )",
448
                "UPDATE \"dbo\".\"TEST1\" SET \"name\" = ?, \"geom\" = NVL2((?),SDO_GEOMETRY((?), (4326)),NULL) WHERE ( (\"id\") = (?) )",
449 449
                sqlbuilder.toString()
450 450
        );
451 451
        assertEquals(
......
482 482
        System.out.println("# Variables:: " + ArrayUtils.toString(sqlbuilder.variables_names()));
483 483
        System.out.println("# Parametros:: " + ArrayUtils.toString(sqlbuilder.parameters_names()));
484 484
        assertEquals(
485
                "UPDATE \"dbo\".\"test1\" SET \"name\" = ?, \"geom\" = NVL2((?),SDO_GEOMETRY((?), (?)),NULL) WHERE ( (\"id\") = (?) )",
485
                "UPDATE \"dbo\".\"TEST1\" SET \"name\" = ?, \"geom\" = NVL2((?),SDO_GEOMETRY((?), (?)),NULL) WHERE ( (\"id\") = (?) )",
486 486
                sqlbuilder.toString()
487 487
        );
488 488
        
......
580 580
        System.out.println("# Parametros:: " + ArrayUtils.toString(sqlbuilder.parameters_names()));
581 581

  
582 582
        //# Test:: testCount
583
        //# SQL:: SELECT NVL2((?),SDO_GEOMETRY((?).Get_WKB(), (?)),NULL), "ID", SDO_GEOMETRY((TO_BLOB(HEXTORAW('000000000300000001000000050000000000000000000000000000000000000000000000004059000000000000405900000000000040590000000000004059000000000000000000000000000000000000000000000000000000000000'))), (4326)) FROM "dbo"."test1" 
583
        //# SQL:: SELECT NVL2((?),SDO_GEOMETRY((?).Get_WKB(), (?)),NULL), "ID", SDO_GEOMETRY((TO_BLOB(HEXTORAW('000000000300000001000000050000000000000000000000000000000000000000000000004059000000000000405900000000000040590000000000004059000000000000000000000000000000000000000000000000000000000000'))), (4326)) FROM "dbo"."TEST1" 
584 584
        //# Variables:: []
585 585
        //# Parametros:: ["Geometry", "Geometry", "ID"]
586 586

  
587 587
        assertEquals(
588
                "SELECT NVL2((?),SDO_GEOMETRY((?), (4326)),NULL), ?, SDO_GEOMETRY((TO_BLOB(HEXTORAW('000000000300000001000000050000000000000000000000000000000000000000000000004059000000000000405900000000000040590000000000004059000000000000000000000000000000000000000000000000000000000000'))), (4326)) FROM \"dbo\".\"test1\"",
588
                "SELECT NVL2((?),SDO_GEOMETRY((?), (4326)),NULL), ?, SDO_GEOMETRY((TO_BLOB(HEXTORAW('000000000300000001000000050000000000000000000000000000000000000000000000004059000000000000405900000000000040590000000000004059000000000000000000000000000000000000000000000000000000000000'))), (4326)) FROM \"dbo\".\"TEST1\"",
589 589
                sqlbuilder.toString()
590 590
        );
591 591
        assertEquals(
......
633 633
        System.out.println("# Parametros:: " + ArrayUtils.toString(sqlbuilder.parameters_names()));
634 634

  
635 635
        //# Test:: testCount
636
        //# SQL:: SELECT NVL2((?),SDO_GEOMETRY((?).Get_WKB(), (?)),NULL), "ID", SDO_GEOMETRY((TO_BLOB(HEXTORAW('000000000300000001000000050000000000000000000000000000000000000000000000004059000000000000405900000000000040590000000000004059000000000000000000000000000000000000000000000000000000000000'))), (4326)) FROM "dbo"."test1" 
636
        //# SQL:: SELECT NVL2((?),SDO_GEOMETRY((?).Get_WKB(), (?)),NULL), "ID", SDO_GEOMETRY((TO_BLOB(HEXTORAW('000000000300000001000000050000000000000000000000000000000000000000000000004059000000000000405900000000000040590000000000004059000000000000000000000000000000000000000000000000000000000000'))), (4326)) FROM "dbo"."TEST1" 
637 637
        //# Variables:: []
638 638
        //# Parametros:: ["Geometry", "Geometry", "ID"]
639 639

  
640 640
        assertEquals(
641
                "SELECT NVL2((?),SDO_GEOMETRY((?), (4326)),NULL), ? FROM \"dbo\".\"test1\" WHERE ( (( (NVL2((?),SDO_GEOMETRY((?), (4326)),NULL)) IS NOT NULL )) AND ((SDO_RELATE(NVL2((?),SDO_GEOMETRY((?), (4326)),NULL), SDO_GEOMETRY((TO_BLOB(HEXTORAW('000000000300000001000000050000000000000000000000000000000000000000000000004059000000000000405900000000000040590000000000004059000000000000000000000000000000000000000000000000000000000000'))), (4326)), 'mask=ANYINTERACT') = 'TRUE')) )",
641
                "SELECT NVL2((?),SDO_GEOMETRY((?), (4326)),NULL), ? FROM \"dbo\".\"TEST1\" WHERE ( (( (NVL2((?),SDO_GEOMETRY((?), (4326)),NULL)) IS NOT NULL )) AND ((SDO_RELATE(NVL2((?),SDO_GEOMETRY((?), (4326)),NULL), SDO_GEOMETRY((TO_BLOB(HEXTORAW('000000000300000001000000050000000000000000000000000000000000000000000000004059000000000000405900000000000040590000000000004059000000000000000000000000000000000000000000000000000000000000'))), (4326)), 'mask=ANYINTERACT') = 'TRUE')) )",
642 642
                sqlbuilder.toString()
643 643
        );
644 644
        assertEquals(
......
664 664
        System.out.println("# Variables:: " + ArrayUtils.toString(sqlbuilder.variables_names()));
665 665
        System.out.println("# Parametros:: " + ArrayUtils.toString(sqlbuilder.parameters_names()));
666 666
        assertEquals(
667
                "UPDATE \"dbo\".\"test1\" SET \"name\" = ? WHERE (1=1)",
667
                "UPDATE \"dbo\".\"TEST1\" SET \"name\" = ? WHERE (1=1)",
668 668
                sqlbuilder.toString()
669 669
        );
670 670
        assertEquals(

Also available in: Unified diff