Revision 916

View differences:

org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/main/resources/org/gvsig/oracle/dal/OracleParameters.xml
37 37
          <description></description>
38 38
        </field>
39 39
	<field name="forceUppercaseInTableName" label="Force uppercase in table name" type="boolean" mandatory="false"
40
          defaultValue="false" group="Advanced">
40
          defaultValue="true" group="Advanced">
41 41
          <description></description>
42 42
        </field>
43 43
      </fields>
org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/main/java/org/gvsig/oracle/dal/OracleSQLBuilder.java
71 71
import org.gvsig.tools.dataTypes.DataTypeUtils;
72 72
import org.gvsig.tools.dataTypes.DataTypesManager;
73 73
import org.gvsig.tools.dispose.Disposable;
74
import org.gvsig.fmap.dal.store.jdbc2.OperationsFactory.TableReference;
74 75

  
75 76
public class OracleSQLBuilder extends JDBCSQLBuilderBase {
76 77

  
......
205 206
        public List<String> toStrings() {
206 207
            List<String> sqls = new ArrayList<>();
207 208

  
208
            String name = as_identifier(this.table.getName());
209
            if (table.has_schema()) {
210
                name = as_identifier(this.table.getSchema()) + "." + name;
211
            }
209
//            String name = as_identifier(this.table.getName());
210
//            if (table.has_schema()) {
211
//                name = as_identifier(this.table.getSchema()) + "." + name;
212
//            }
212 213
            String sql = MessageFormat.format(
213 214
                    "ANALYZE TABLE {0} COMPUTE STATISTICS",
214
                    name
215
                    this.table.toString()
215 216
            );
216 217
            if (!StringUtils.isEmpty(sql)) {
217 218
                sqls.add(sql);
......
588 589
        return new OracleUpdateTableStatisticsBuilderBase();
589 590
    }
590 591

  
592
    public String getProviderTableName(TableReference table) {
593
        return this.getProviderTableName(table.getTable());
594
    }
595
    
596
    private String getProviderTableName(String tableName) {
597
        boolean forceUpperCase = true;
598
        OracleConnectionParameters params = getHelper().getConnectionParameters();
599
        if (params != null) {
600
            forceUpperCase = params.getForceUppercaseInTableName();
601
        }
602
        if( forceUpperCase ) {
603
            return StringUtils.upperCase(tableName);
604
        }
605
        return tableName;
606
    }
607
    
591 608
    protected class OracleTableNameBuilder extends TableNameBuilderBase {
592 609

  
593 610
        @Override
......
609 626
        }
610 627

  
611 628
        protected String tableName2provider() {
612
            boolean forceUpperCase = true;
613
            OracleConnectionParameters params = getHelper().getConnectionParameters();
614
            if (params != null) {
615
                forceUpperCase = params.getForceUppercaseInTableName();
616
            }
617
            if( forceUpperCase ) {
618
                return StringUtils.upperCase(this.tableName);
619
            }
620
            return this.tableName;
629
            return getProviderTableName(this.tableName);
621 630
        }
622 631

  
623 632

  
org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/main/java/org/gvsig/oracle/dal/operations/OracleFetchFeatureTypeOperation.java
55 55
    public void fetch(JDBCConnection conn) throws DataException {
56 56
        super.fetch(conn);
57 57
    }
58

  
58
    
59 59
    @Override
60 60
    public String getSQLToRetrievePrimaryKeysFromInformationSchema() throws SQLException {
61
        JDBCSQLBuilderBase sqlbuilder = this.createSQLBuilder();
61
        OracleSQLBuilder sqlbuilder = (OracleSQLBuilder) this.createSQLBuilder();
62 62
        ExpressionBuilder expbuilder = sqlbuilder.expression();
63 63

  
64 64
        sqlbuilder.select().column().name(
......
97 97
                                        +"TABLE_NAME"
98 98
                                        +sqlbuilder.quote_for_identifiers()),
99 99
                        
100
                        expbuilder.constant(table.getTable())
100
                        expbuilder.constant(sqlbuilder.getProviderTableName(table))
101 101
                )
102 102
        );
103 103

  
org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/test/resources/org/gvsig/oracle/dal/operations/sql/performChanges.sql
1 1

  
2 2
-- Insert SQL
3
INSERT INTO "P1"."test" ( 
3
INSERT INTO "P1"."TEST" ( 
4 4
    "ID", "Byte", "Bool1", "Long", "Timestamp", "Date", "Time", 
5 5
    "Bool2", "String", "Bool3", "Double", "Bool4", "Float", "Bool5", 
6 6
    "Decimal", "Geometry" 
......
9 9
);
10 10

  
11 11
-- Delete SQL
12
DELETE FROM "P1"."test" WHERE ( ("ID") = (?) );
12
DELETE FROM "P1"."TEST" WHERE ( ("ID") = (?) );
13 13

  
14 14
-- Update SQL
15
UPDATE "P1"."test" 
15
UPDATE "P1"."TEST" 
16 16
    SET 
17 17
        "Byte" = ?, 
18 18
        "Bool1" = ?, 
......
34 34

  
35 35

  
36 36
-- Update Table SQL
37
ALTER TABLE "P1"."test" ADD "Byte" NUMBER(3,0) DEFAULT NULL NULL;
38
ALTER TABLE "P1"."test" ADD "Bool1" CHAR(1) DEFAULT NULL NULL;
39
ALTER TABLE "P1"."test" ADD "Long" NUMBER(18,0) DEFAULT NULL NULL;
40
ALTER TABLE "P1"."test" ADD "Timestamp" TIMESTAMP DEFAULT NULL NULL;
41
ALTER TABLE "P1"."test" ADD "Date" DATE DEFAULT NULL NULL;
42
ALTER TABLE "P1"."test" ADD "Time" TIMESTAMP DEFAULT NULL NULL;
43
ALTER TABLE "P1"."test" ADD "Bool2" CHAR(1) DEFAULT NULL NULL;
44
ALTER TABLE "P1"."test" ADD "String" NVARCHAR2(30) DEFAULT NULL NULL;
45
ALTER TABLE "P1"."test" ADD "Bool3" CHAR(1) DEFAULT NULL NULL;
46
ALTER TABLE "P1"."test" ADD "Double" BINARY_DOUBLE DEFAULT NULL NULL;
47
ALTER TABLE "P1"."test" ADD "Bool4" CHAR(1) DEFAULT NULL NULL;
48
ALTER TABLE "P1"."test" ADD "Float" BINARY_FLOAT DEFAULT NULL NULL;
49
ALTER TABLE "P1"."test" ADD "Bool5" CHAR(1) DEFAULT NULL NULL;
50
ALTER TABLE "P1"."test" ADD "Decimal" NUMBER(6,3) DEFAULT NULL NULL;
51
ALTER TABLE "P1"."test" ADD "Geometry" SDO_GEOMETRY DEFAULT NULL NULL;
37
ALTER TABLE "P1"."TEST" ADD "Byte" NUMBER(3,0) DEFAULT NULL NULL;
38
ALTER TABLE "P1"."TEST" ADD "Bool1" CHAR(1) DEFAULT NULL NULL;
39
ALTER TABLE "P1"."TEST" ADD "Long" NUMBER(18,0) DEFAULT NULL NULL;
40
ALTER TABLE "P1"."TEST" ADD "Timestamp" TIMESTAMP DEFAULT NULL NULL;
41
ALTER TABLE "P1"."TEST" ADD "Date" DATE DEFAULT NULL NULL;
42
ALTER TABLE "P1"."TEST" ADD "Time" TIMESTAMP DEFAULT NULL NULL;
43
ALTER TABLE "P1"."TEST" ADD "Bool2" CHAR(1) DEFAULT NULL NULL;
44
ALTER TABLE "P1"."TEST" ADD "String" NVARCHAR2(30) DEFAULT NULL NULL;
45
ALTER TABLE "P1"."TEST" ADD "Bool3" CHAR(1) DEFAULT NULL NULL;
46
ALTER TABLE "P1"."TEST" ADD "Double" BINARY_DOUBLE DEFAULT NULL NULL;
47
ALTER TABLE "P1"."TEST" ADD "Bool4" CHAR(1) DEFAULT NULL NULL;
48
ALTER TABLE "P1"."TEST" ADD "Float" BINARY_FLOAT DEFAULT NULL NULL;
49
ALTER TABLE "P1"."TEST" ADD "Bool5" CHAR(1) DEFAULT NULL NULL;
50
ALTER TABLE "P1"."TEST" ADD "Decimal" NUMBER(6,3) DEFAULT NULL NULL;
51
ALTER TABLE "P1"."TEST" ADD "Geometry" SDO_GEOMETRY DEFAULT NULL NULL;
52 52

  
53 53

  
54 54
DELETE FROM MDSYS.OGIS_GEOMETRY_COLUMNS 
org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/test/resources/org/gvsig/oracle/dal/operations/sql/updateTableStatistics.sql
1 1

  
2 2
-- UpdateTableStatistics SQL
3
ANALYZE TABLE "P1"."test" COMPUTE STATISTICS;
3
ANALYZE TABLE "P1"."TEST" COMPUTE STATISTICS;
org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/test/resources/org/gvsig/oracle/dal/operations/sql/append.sql
1
INSERT INTO "P1"."test" ( 
1
INSERT INTO "P1"."TEST" ( 
2 2
    "ID", "Byte", "Bool1", "Long", "Timestamp", "Date", "Time", 
3 3
    "Bool2", "String", "Bool3", "Double", "Bool4", "Float", "Bool5", 
4 4
    "Decimal", "Geometry" 
org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/test/resources/org/gvsig/oracle/dal/operations/sql/fetchFeatureType.sql
1 1

  
2 2
-- FetchFeatureType first row SQL
3
SELECT * FROM "P1"."test" WHERE  ROWNUM <= 0;
3
SELECT * FROM "P1"."TEST" WHERE  ROWNUM <= 0;
4 4

  
5 5
SELECT "USER_TAB_COLS"."COLUMN_NAME", "ALL_CONSTRAINTS"."CONSTRAINT_TYPE" 
6 6
FROM USER_TAB_COLS 
7 7
JOIN ALL_CONS_COLUMNS on (ALL_CONS_COLUMNS.TABLE_NAME = USER_TAB_COLS.TABLE_NAME and ALL_CONS_COLUMNS.COLUMN_NAME = USER_TAB_COLS.COLUMN_NAME) 
8 8
LEFT JOIN ALL_CONSTRAINTS on ALL_CONSTRAINTS.CONSTRAINT_NAME = ALL_CONS_COLUMNS.CONSTRAINT_NAME 
9 9
WHERE ( 
10
    (( ("USER_TAB_COLS"."TABLE_NAME") LIKE ('test') )) 
10
    (( ("USER_TAB_COLS"."TABLE_NAME") LIKE ('TEST') )) 
11 11
    AND 
12 12
    (( ("ALL_CONSTRAINTS"."CONSTRAINT_TYPE") = ('P') )) 
13 13
);
org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/test/resources/org/gvsig/oracle/dal/operations/sql/count.sql
10 10

  
11 11

  
12 12
-- begin count
13
SELECT COUNT(*) FROM "P1"."test"
13
SELECT COUNT(*) FROM "P1"."TEST"
14 14
-- end count
15 15

  
16 16
-- begin testAggregatesAndGroup
17 17
-- rem Count with aggregates and group SQL
18 18
SELECT COUNT(*) 
19 19
FROM ( 
20
    SELECT MAX("P1"."test"."Byte") "Byte", 
21
        MIN("P1"."test"."ID") "ID", 
22
        SUM("P1"."test"."Double") "Double" 
23
    FROM "P1"."test" 
24
    GROUP BY "P1"."test"."Long") "_subquery_alias_" 
20
    SELECT MAX("P1"."TEST"."Byte") "Byte", 
21
        MIN("P1"."TEST"."ID") "ID", 
22
        SUM("P1"."TEST"."Double") "Double" 
23
    FROM "P1"."TEST" 
24
    GROUP BY "P1"."TEST"."Long") "_subquery_alias_" 
25 25
-- end testAggregatesAndGroup
26 26

  
27 27
-- begin testGroup
28 28
-- rem Count with group SQL
29 29
SELECT COUNT(*) 
30
FROM ( SELECT "P1"."test"."Long" 
31
      FROM "P1"."test" 
32
      GROUP BY "P1"."test"."Long") "_subquery_alias_" 
30
FROM ( SELECT "P1"."TEST"."Long" 
31
      FROM "P1"."TEST" 
32
      GROUP BY "P1"."TEST"."Long") "_subquery_alias_" 
33 33
-- end testGroup
34 34

  
35 35
-- begin testAggregates
36 36
-- rem Count with aggregates
37 37
SELECT COUNT(*) 
38
FROM ( SELECT MAX("P1"."test"."Byte") "Byte", 
39
             MIN("P1"."test"."ID") "ID", 
40
             SUM("P1"."test"."Double") "Double" 
41
      FROM "P1"."test") "_subquery_alias_" 
38
FROM ( SELECT MAX("P1"."TEST"."Byte") "Byte", 
39
             MIN("P1"."TEST"."ID") "ID", 
40
             SUM("P1"."TEST"."Double") "Double" 
41
      FROM "P1"."TEST") "_subquery_alias_" 
42 42
-- end testAggregates
43 43

  
org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/test/resources/org/gvsig/oracle/dal/operations/sql/resultSetForSetProvider.sql
3 3

  
4 4
-- Simple
5 5
SELECT 
6
    "P1"."test"."ID", "P1"."test"."Byte", "P1"."test"."Bool1", "P1"."test"."Long", 
7
    "P1"."test"."Timestamp", "P1"."test"."Date", "P1"."test"."Time", 
8
    "P1"."test"."Bool2", "P1"."test"."String", "P1"."test"."Bool3", 
9
    "P1"."test"."Double", "P1"."test"."Bool4", "P1"."test"."Float", "P1"."test"."Bool5", "P1"."test"."Decimal", 
10
    NVL2(("P1"."test"."Geometry"),("P1"."test"."Geometry").Get_WKB(),NULL) 
11
FROM "P1"."test" ORDER BY "P1"."test"."ID" ASC;
6
    "P1"."TEST"."ID", "P1"."TEST"."Byte", "P1"."TEST"."Bool1", "P1"."TEST"."Long", 
7
    "P1"."TEST"."Timestamp", "P1"."TEST"."Date", "P1"."TEST"."Time", 
8
    "P1"."TEST"."Bool2", "P1"."TEST"."String", "P1"."TEST"."Bool3", 
9
    "P1"."TEST"."Double", "P1"."TEST"."Bool4", "P1"."TEST"."Float", "P1"."TEST"."Bool5", "P1"."TEST"."Decimal", 
10
    NVL2(("P1"."TEST"."Geometry"),("P1"."TEST"."Geometry").Get_WKB(),NULL) 
11
FROM "P1"."TEST" ORDER BY "P1"."TEST"."ID" ASC;
12 12

  
13 13
-- Simple Group by
14
SELECT MIN("P1"."test"."ID") "ID", MAX("P1"."test"."Byte") "Byte", NULL "Bool1", "P1"."test"."Long", 
14
SELECT MIN("P1"."TEST"."ID") "ID", MAX("P1"."TEST"."Byte") "Byte", NULL "Bool1", "P1"."TEST"."Long", 
15 15
    NULL "Timestamp", NULL "Date", NULL "Time", NULL "Bool2", 
16
    NULL "String", NULL "Bool3", SUM("P1"."test"."Double") "Double", 
16
    NULL "String", NULL "Bool3", SUM("P1"."TEST"."Double") "Double", 
17 17
    NULL "Bool4", NULL "Float", NULL "Bool5", NULL "Decimal", 
18 18
    NULL "Geometry" 
19
FROM "P1"."test" 
20
GROUP BY "P1"."test"."Long" 
21
ORDER BY "P1"."test"."Long" ASC NULLS LAST;
19
FROM "P1"."TEST" 
20
GROUP BY "P1"."TEST"."Long" 
21
ORDER BY "P1"."TEST"."Long" ASC NULLS LAST;
22 22

  
23 23
-- Subselect
24
SELECT "P1"."test"."ID", 
25
       "P1"."test"."Byte", 
26
       "P1"."test"."Bool1", 
27
       "P1"."test"."Long", 
28
       "P1"."test"."Timestamp", 
29
       "P1"."test"."Date", 
30
       "P1"."test"."Time", 
31
       "P1"."test"."Bool2", 
32
       "P1"."test"."String", 
33
       "P1"."test"."Bool3", 
34
       "P1"."test"."Double", 
35
       "P1"."test"."Bool4", 
36
       "P1"."test"."Float", 
37
       "P1"."test"."Bool5", 
38
       "P1"."test"."Decimal", 
39
       NVL2(("P1"."test"."Geometry"),("P1"."test"."Geometry").Get_WKB(),NULL), 
24
SELECT "P1"."TEST"."ID", 
25
       "P1"."TEST"."Byte", 
26
       "P1"."TEST"."Bool1", 
27
       "P1"."TEST"."Long", 
28
       "P1"."TEST"."Timestamp", 
29
       "P1"."TEST"."Date", 
30
       "P1"."TEST"."Time", 
31
       "P1"."TEST"."Bool2", 
32
       "P1"."TEST"."String", 
33
       "P1"."TEST"."Bool3", 
34
       "P1"."TEST"."Double", 
35
       "P1"."TEST"."Bool4", 
36
       "P1"."TEST"."Float", 
37
       "P1"."TEST"."Bool5", 
38
       "P1"."TEST"."Decimal", 
39
       NVL2(("P1"."TEST"."Geometry"),("P1"."TEST"."Geometry").Get_WKB(),NULL), 
40 40
       CASE 
41
         WHEN (EXISTS(( SELECT "P1"."countries"."ISO_A2" 
42
                       FROM "P1"."countries" 
43
                       WHERE ( (( ("P1"."test"."String") = ("countries"."CONTINENT") )) AND (( ("countries"."LASTCENSUS") < (0) )) ) AND  ROWNUM <= 1 ))) THEN (1) 
41
         WHEN (EXISTS(( SELECT "P1"."COUNTRIES"."ISO_A2" 
42
                       FROM "P1"."COUNTRIES" 
43
                       WHERE ( (( ("P1"."TEST"."String") = ("countries"."CONTINENT") )) AND (( ("countries"."LASTCENSUS") < (0) )) ) AND  ROWNUM <= 1 ))) THEN (1) 
44 44
         ELSE (0) 
45 45
       END "EXISTS62a964cd7bc24f409b97c03b9170408d" 
46
FROM "P1"."test" 
47
WHERE EXISTS(( SELECT "P1"."countries"."ISO_A2" 
48
                       FROM "P1"."countries" 
49
                       WHERE ( (( ("P1"."test"."String") = ("countries"."CONTINENT") )) AND (( ("countries"."LASTCENSUS") < (0) )) ) AND  ROWNUM <= 1 )) 
50
ORDER BY "P1"."test"."ID" ASC;
46
FROM "P1"."TEST" 
47
WHERE EXISTS(( SELECT "P1"."COUNTRIES"."ISO_A2" 
48
                       FROM "P1"."COUNTRIES" 
49
                       WHERE ( (( ("P1"."TEST"."String") = ("countries"."CONTINENT") )) AND (( ("countries"."LASTCENSUS") < (0) )) ) AND  ROWNUM <= 1 )) 
50
ORDER BY "P1"."TEST"."ID" ASC;
51 51

  
52 52
-- Group and Subselect
53
SELECT MIN("P1"."test"."ID") "ID", MAX("P1"."test"."Byte") "Byte", NULL "Bool1", "P1"."test"."Long", NULL "Timestamp", NULL "Date", NULL "Time", NULL "Bool2", NULL "String", NULL "Bool3", SUM("P1"."test"."Double") "Double", NULL "Bool4", NULL "Float", NULL "Bool5", NULL "Decimal", NULL "Geometry" FROM "P1"."test" WHERE EXISTS(( SELECT "P1"."countries"."ISO_A2" FROM "P1"."countries" WHERE ( (( ("P1"."test"."String") = ("countries"."CONTINENT") )) AND (( ("countries"."LASTCENSUS") < (0) )) ) AND  ROWNUM <= 1 )) GROUP BY "P1"."test"."Long" ORDER BY "P1"."test"."Long" ASC NULLS LAST;
53
SELECT MIN("P1"."TEST"."ID") "ID", MAX("P1"."TEST"."Byte") "Byte", NULL "Bool1", "P1"."TEST"."Long", NULL "Timestamp", NULL "Date", NULL "Time", NULL "Bool2", NULL "String", NULL "Bool3", SUM("P1"."TEST"."Double") "Double", NULL "Bool4", NULL "Float", NULL "Bool5", NULL "Decimal", NULL "Geometry" FROM "P1"."TEST" WHERE EXISTS(( SELECT "P1"."COUNTRIES"."ISO_A2" FROM "P1"."COUNTRIES" WHERE ( (( ("P1"."TEST"."String") = ("countries"."CONTINENT") )) AND (( ("countries"."LASTCENSUS") < (0) )) ) AND  ROWNUM <= 1 )) GROUP BY "P1"."TEST"."Long" ORDER BY "P1"."TEST"."Long" ASC NULLS LAST;
54 54

  
55 55
-- Constant Column Primary Key
56 56
SELECT 
57
    "P1"."test"."ID", 
58
    "P1"."test"."Byte", "P1"."test"."Bool1", "P1"."test"."Long", 
59
    "P1"."test"."Timestamp", "P1"."test"."Date", "P1"."test"."Time", 
60
    "P1"."test"."Bool2", "P1"."test"."String", "P1"."test"."Bool3", 
61
    "P1"."test"."Double", "P1"."test"."Bool4", "P1"."test"."Float", "P1"."test"."Bool5", "P1"."test"."Decimal", 
62
    NVL2(("P1"."test"."Geometry"),("P1"."test"."Geometry").Get_WKB(),NULL) 
63
FROM "P1"."test" ORDER BY "P1"."test"."ID" ASC;
57
    "P1"."TEST"."ID", 
58
    "P1"."TEST"."Byte", "P1"."TEST"."Bool1", "P1"."TEST"."Long", 
59
    "P1"."TEST"."Timestamp", "P1"."TEST"."Date", "P1"."TEST"."Time", 
60
    "P1"."TEST"."Bool2", "P1"."TEST"."String", "P1"."TEST"."Bool3", 
61
    "P1"."TEST"."Double", "P1"."TEST"."Bool4", "P1"."TEST"."Float", "P1"."TEST"."Bool5", "P1"."TEST"."Decimal", 
62
    NVL2(("P1"."TEST"."Geometry"),("P1"."TEST"."Geometry").Get_WKB(),NULL) 
63
FROM "P1"."TEST" ORDER BY "P1"."TEST"."ID" ASC;
64 64

  
65 65
-- CLOB
66 66
SELECT 
67
    "P1"."test"."ID", "P1"."test"."Byte", "P1"."test"."Bool1", "P1"."test"."Long", 
68
    "P1"."test"."Timestamp", "P1"."test"."Date", "P1"."test"."Time", 
69
    "P1"."test"."Bool2", "P1"."test"."String", "P1"."test"."Bool3", 
70
    "P1"."test"."Double", "P1"."test"."Bool4", "P1"."test"."Float", "P1"."test"."Bool5", "P1"."test"."Decimal", 
71
    NVL2(("P1"."test"."Geometry"),("P1"."test"."Geometry").Get_WKB(),NULL) 
72
FROM "P1"."test" 
73
WHERE dbms_lob.compare(("P1"."test"."String"),('hola')) = 0 ORDER BY "P1"."test"."ID" ASC;
67
    "P1"."TEST"."ID", "P1"."TEST"."Byte", "P1"."TEST"."Bool1", "P1"."TEST"."Long", 
68
    "P1"."TEST"."Timestamp", "P1"."TEST"."Date", "P1"."TEST"."Time", 
69
    "P1"."TEST"."Bool2", "P1"."TEST"."String", "P1"."TEST"."Bool3", 
70
    "P1"."TEST"."Double", "P1"."TEST"."Bool4", "P1"."TEST"."Float", "P1"."TEST"."Bool5", "P1"."TEST"."Decimal", 
71
    NVL2(("P1"."TEST"."Geometry"),("P1"."TEST"."Geometry").Get_WKB(),NULL) 
72
FROM "P1"."TEST" 
73
WHERE dbms_lob.compare(("P1"."TEST"."String"),('hola')) = 0 ORDER BY "P1"."TEST"."ID" ASC;
org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/test/resources/org/gvsig/oracle/dal/operations/sql/fetchFeatureProviderByReference.sql
1 1

  
2 2
-- fetchFeatureProviderByReference SQL
3 3
SELECT 
4
    "P1"."test"."ID", "P1"."test"."Byte", "P1"."test"."Bool1", "P1"."test"."Long", 
5
    "P1"."test"."Timestamp", "P1"."test"."Date", "P1"."test"."Time", 
6
    "P1"."test"."Bool2", "P1"."test"."String", "P1"."test"."Bool3", "P1"."test"."Double", 
7
    "P1"."test"."Bool4", "P1"."test"."Float", "P1"."test"."Bool5", "P1"."test"."Decimal", 
8
    NVL2(("P1"."test"."Geometry"),("P1"."test"."Geometry").Get_WKB(),NULL) 
9
FROM "P1"."test" 
10
WHERE ( ("P1"."test"."ID") = (?) ) AND  ROWNUM <= 1;
4
    "P1"."TEST"."ID", "P1"."TEST"."Byte", "P1"."TEST"."Bool1", "P1"."TEST"."Long", 
5
    "P1"."TEST"."Timestamp", "P1"."TEST"."Date", "P1"."TEST"."Time", 
6
    "P1"."TEST"."Bool2", "P1"."TEST"."String", "P1"."TEST"."Bool3", "P1"."TEST"."Double", 
7
    "P1"."TEST"."Bool4", "P1"."TEST"."Float", "P1"."TEST"."Bool5", "P1"."TEST"."Decimal", 
8
    NVL2(("P1"."TEST"."Geometry"),("P1"."TEST"."Geometry").Get_WKB(),NULL) 
9
FROM "P1"."TEST" 
10
WHERE ( ("P1"."TEST"."ID") = (?) ) AND  ROWNUM <= 1;
org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/test/resources/org/gvsig/oracle/dal/operations/sql/calculateEnvelope.sql
6 6
--FROM "public"."test" 
7 7
--WHERE ( ("Geometry") IS NOT NULL );
8 8

  
9
SELECT NVL2((SDO_AGGR_MBR("P1"."test"."Geometry")),(SDO_AGGR_MBR("P1"."test"."Geometry")).Get_WKB(),NULL) 
10
FROM "P1"."test" 
11
WHERE ( ("P1"."test"."Geometry") IS NOT NULL );
9
SELECT NVL2((SDO_AGGR_MBR("P1"."TEST"."Geometry")),(SDO_AGGR_MBR("P1"."TEST"."Geometry")).Get_WKB(),NULL) 
10
FROM "P1"."TEST" 
11
WHERE ( ("P1"."TEST"."Geometry") IS NOT NULL );
org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/test/resources/org/gvsig/oracle/dal/operations/sql/dropTable.sql
1 1

  
2 2
-- Drop table SQL
3
DROP TABLE "P1"."test";
3
DROP TABLE "P1"."TEST";
4 4

  
5 5
DELETE FROM MDSYS.OGIS_GEOMETRY_COLUMNS WHERE F_TABLE_SCHEMA = 'P1' AND F_TABLE_NAME = 'test';
org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/test/resources/org/gvsig/oracle/dal/operations/sql/date.sql
2 2
-- Date SQL
3 3

  
4 4
SELECT 
5
    "P1"."test"."ID", "P1"."test"."Byte", "P1"."test"."Bool1", "P1"."test"."Long", 
6
    "P1"."test"."Timestamp", "P1"."test"."Date", "P1"."test"."Time", "P1"."test"."Bool2", 
7
    "P1"."test"."String", "P1"."test"."Bool3", "P1"."test"."Double", 
8
    "P1"."test"."Bool4", "P1"."test"."Float", "P1"."test"."Bool5", "P1"."test"."Decimal", 
9
    NVL2(("P1"."test"."Geometry"),("P1"."test"."Geometry").Get_WKB(),NULL) 
10
FROM "P1"."test" 
5
    "P1"."TEST"."ID", "P1"."TEST"."Byte", "P1"."TEST"."Bool1", "P1"."TEST"."Long", 
6
    "P1"."TEST"."Timestamp", "P1"."TEST"."Date", "P1"."TEST"."Time", "P1"."TEST"."Bool2", 
7
    "P1"."TEST"."String", "P1"."TEST"."Bool3", "P1"."TEST"."Double", 
8
    "P1"."TEST"."Bool4", "P1"."TEST"."Float", "P1"."TEST"."Bool5", "P1"."TEST"."Decimal", 
9
    NVL2(("P1"."TEST"."Geometry"),("P1"."TEST"."Geometry").Get_WKB(),NULL) 
10
FROM "P1"."TEST" 
11 11
WHERE ( 
12 12
    (( 
13
        (( ("P1"."test"."Time") > (TIMESTAMP '1970-01-01 01:02:03') )) 
13
        (( ("P1"."TEST"."Time") > (TIMESTAMP '1970-01-01 01:02:03') )) 
14 14
        AND 
15
        (( ("P1"."test"."Time") < (TIMESTAMP '1970-01-01 20:52:55') )) 
15
        (( ("P1"."TEST"."Time") < (TIMESTAMP '1970-01-01 20:52:55') )) 
16 16
    )) 
17 17
    OR 
18 18
    (( 
19
        (( ("P1"."test"."Date") > (DATE '2019-02-17') )) 
19
        (( ("P1"."TEST"."Date") > (DATE '2019-02-17') )) 
20 20
        AND 
21
        (( ("P1"."test"."Date") < (DATE '2020-02-23') )) 
21
        (( ("P1"."TEST"."Date") < (DATE '2020-02-23') )) 
22 22
    )) 
23
) ORDER BY "P1"."test"."ID" ASC;
23
) ORDER BY "P1"."TEST"."ID" ASC;
org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/test/resources/org/gvsig/oracle/dal/operations/sql/tableIsEmpty.sql
1 1

  
2 2
-- Table is empty
3
SELECT 1 FROM "P1"."test" WHERE  ROWNUM <= 1;
3
SELECT 1 FROM "P1"."TEST" WHERE  ROWNUM <= 1;
org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/test/java/org/gvsig/oracle/dal/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