Revision 44058 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.jdbc/src/main/java/org/gvsig/fmap/dal/store/jdbc2/impl/JDBCSetProvider.java

View differences:

JDBCSetProvider.java
55 55

  
56 56
public class JDBCSetProvider extends AbstractFeatureSetProvider {
57 57

  
58
    final static protected Logger logger = LoggerFactory.getLogger(JDBCSetProvider.class);
58
    final static protected Logger LOGGER = LoggerFactory.getLogger(JDBCSetProvider.class);
59 59

  
60 60
    private class EmptyJDBCIterator extends JDBCIterator {
61 61

  
......
248 248
                filtersql = filter.getSQL();
249 249
            }
250 250
            CountOperation selectCount = this.getOperations().createCount(
251
                    params.getDBName(),
252
                    params.getSchema(),
253
                    params.getTable(),
254
                    params.getSQL(),
251
                    this.getOperations().createTableReference(params),
255 252
                    params.getBaseFilter(), 
256 253
                    filtersql
257 254
            );
......
270 267
                if( filter != null ) {
271 268
                    filtersql = filter.getSQL();
272 269
                }
273
                TableIsEmptyOperation isEmpty = this.getOperations().createTableIsEmpty(
274
                        params.getDBName(),
275
                        params.getSchema(),
276
                        params.getTable(),
277
                        params.getSQL(),
270
                TableIsEmptyOperation isEmpty_ = this.getOperations().createTableIsEmpty(
271
                        this.getOperations().createTableReference(params),
278 272
                        params.getBaseFilter(), 
279 273
                        filtersql
280 274
                );
281
                this.isEmpty = (Boolean) isEmpty.perform();   
275
                this.isEmpty = (Boolean) isEmpty_.perform();   
282 276
            } else {
283 277
                this.isEmpty = (this.size < 1);
284 278
            }
......
303 297
		.getProviderFeatureType(this.getFeatureType().getId());
304 298
        ResultSetForSetProviderOperation createResultSet 
305 299
            = getOperations().createResultSetForSetProvider(
306
                    params.getDBName(),
307
                    params.getSchema(), 
308
                    params.getTable(), 
309
                    params.getSQL(), 
300
                    this.getOperations().createTableReference(params),
310 301
                    params.getBaseFilter(), 
311 302
                    params.getBaseOrder(), 
312 303
                    this.getQuery(), 
......
344 335
		.getProviderFeatureType(this.getFeatureType().getId());
345 336
        ResultSetForSetProviderOperation createResultSet 
346 337
            = getOperations().createResultSetForSetProvider(
347
                    params.getDBName(),
348
                    params.getSchema(), 
349
                    params.getTable(), 
350
                    params.getSQL(), 
338
                    this.getOperations().createTableReference(params),
351 339
                    params.getBaseFilter(), 
352 340
                    params.getBaseOrder(), 
353 341
                    this.getQuery(), 

Also available in: Unified diff