Revision 916 org.gvsig.oracle/trunk/org.gvsig.oracle/org.gvsig.oracle.provider/src/main/java/org/gvsig/oracle/dal/OracleSQLBuilder.java

View differences:

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

  

Also available in: Unified diff