Revision 44198 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/spi/JDBCSQLBuilderBase.java
JDBCSQLBuilderBase.java | ||
---|---|---|
6 | 6 |
import java.util.ArrayList; |
7 | 7 |
import java.util.List; |
8 | 8 |
import org.cresques.cts.IProjection; |
9 |
import org.gvsig.expressionevaluator.ExpressionBuilder.GeometrySupportType; |
|
10 |
import org.gvsig.expressionevaluator.ExpressionBuilder.Parameter; |
|
9 | 11 |
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor; |
10 | 12 |
import org.gvsig.fmap.dal.feature.FeatureReference; |
13 |
import org.gvsig.fmap.dal.feature.FeatureStore; |
|
11 | 14 |
import org.gvsig.fmap.dal.feature.FeatureType; |
12 | 15 |
import org.gvsig.fmap.dal.feature.spi.SQLBuilderBase; |
13 | 16 |
import org.gvsig.fmap.dal.feature.spi.FeatureProvider; |
... | ... | |
25 | 28 |
import org.gvsig.fmap.geom.type.GeometryType; |
26 | 29 |
import org.gvsig.tools.dispose.Disposable; |
27 | 30 |
|
31 |
@SuppressWarnings("UseSpecificCatch") |
|
28 | 32 |
public class JDBCSQLBuilderBase extends SQLBuilderBase { |
29 | 33 |
|
34 |
public static final String PROP_FEATURE_TYPE = "FeatureType"; |
|
35 |
public static final String PROP_TABLE = "Table"; |
|
36 |
|
|
30 | 37 |
private GeometryManager geometryManager = null; |
31 | 38 |
protected final JDBCHelper helper; |
32 | 39 |
|
... | ... | |
47 | 54 |
} |
48 | 55 |
|
49 | 56 |
@Override |
50 |
public Object getSRSId(IProjection projection) {
|
|
57 |
public Object srs_id(IProjection projection) {
|
|
51 | 58 |
Connection conn = null; |
52 | 59 |
try { |
53 | 60 |
conn = this.helper.getConnection(); |
... | ... | |
71 | 78 |
public void setParameters(PreparedStatement st) { |
72 | 79 |
try { |
73 | 80 |
int columnIndex = 1; |
74 |
for (Parameter parameter : this.getParameters()) {
|
|
75 |
st.setObject(columnIndex++, parameter.getValue());
|
|
81 |
for (Parameter parameter : this.parameters()) {
|
|
82 |
st.setObject(columnIndex++, parameter.value());
|
|
76 | 83 |
} |
77 | 84 |
} catch (Exception ex) { |
78 | 85 |
String p = "unknow"; |
79 | 86 |
try { |
80 |
p = this.getParameters().toString();
|
|
87 |
p = this.parameters().toString();
|
|
81 | 88 |
} catch (Exception ex2) { |
82 | 89 |
// Do nothing |
83 | 90 |
} |
... | ... | |
90 | 97 |
FeatureType type = feature.getType(); |
91 | 98 |
List<Object> values = new ArrayList<>(); |
92 | 99 |
Object value; |
93 |
for (Parameter parameter : this.getParameters()) {
|
|
100 |
for (Parameter parameter : this.parameters()) {
|
|
94 | 101 |
if (parameter.is_constant()) { |
95 |
value = parameter.getValue();
|
|
102 |
value = parameter.value();
|
|
96 | 103 |
values.add(value); |
97 | 104 |
} else { |
98 |
String name = parameter.getName();
|
|
105 |
String name = parameter.name();
|
|
99 | 106 |
value = feature.get(name); |
100 | 107 |
FeatureAttributeDescriptor attrDesc = type.getAttributeDescriptor(name); |
101 | 108 |
if( attrDesc.getType()==DataTypes.GEOMETRY ) { |
... | ... | |
173 | 180 |
try { |
174 | 181 |
|
175 | 182 |
List<Object> values = new ArrayList<>(); |
176 |
for (Parameter parameter : this.getParameters()) {
|
|
183 |
for (Parameter parameter : this.parameters()) {
|
|
177 | 184 |
if (parameter.is_constant()) { |
178 |
values.add(parameter.getValue());
|
|
185 |
values.add(parameter.value());
|
|
179 | 186 |
} else { |
180 |
String name = parameter.getName();
|
|
187 |
String name = parameter.name();
|
|
181 | 188 |
values.add(((FeatureReferenceProviderServices)reference).getKeyValue(name)); |
182 | 189 |
} |
183 | 190 |
} |
... | ... | |
205 | 212 |
} |
206 | 213 |
}; |
207 | 214 |
} |
208 |
if( logger.isDebugEnabled() ) {
|
|
215 |
if( LOGGER.isDebugEnabled() ) {
|
|
209 | 216 |
StringBuilder debug = new StringBuilder(); |
210 | 217 |
debug.append("st.set("); |
211 | 218 |
try { |
... | ... | |
219 | 226 |
debug.append("/*"); |
220 | 227 |
debug.append(columnIndex); |
221 | 228 |
debug.append("*/ "); |
222 |
debug.append(string((String) value));
|
|
229 |
debug.append(as_string(value));
|
|
223 | 230 |
debug.append(", "); |
224 | 231 |
break; |
225 | 232 |
case NATIVE: |
... | ... | |
228 | 235 |
debug.append("/*"); |
229 | 236 |
debug.append(columnIndex); |
230 | 237 |
debug.append("*/ "); |
231 |
debug.append(bytearray(bytes));
|
|
238 |
debug.append(as_string(bytes));
|
|
232 | 239 |
debug.append(", "); |
233 | 240 |
break; |
234 | 241 |
case EWKB: |
... | ... | |
236 | 243 |
debug.append("/*"); |
237 | 244 |
debug.append(columnIndex); |
238 | 245 |
debug.append("*/ "); |
239 |
debug.append(bytearray(bytes));
|
|
246 |
debug.append(as_string(bytes));
|
|
240 | 247 |
debug.append(", "); |
241 | 248 |
break; |
242 | 249 |
} |
... | ... | |
245 | 252 |
debug.append(columnIndex); |
246 | 253 |
debug.append("*/ "); |
247 | 254 |
if( value instanceof String ) { |
248 |
debug.append(string((String) value));
|
|
255 |
debug.append(as_string(value));
|
|
249 | 256 |
} else if( value instanceof Boolean ) { |
250 |
debug.append( ((Boolean)value)? config.getString(Config.constant_true):config.getString(Config.constant_false) );
|
|
257 |
debug.append( ((Boolean)value)? constant_true:constant_false );
|
|
251 | 258 |
} else { |
252 | 259 |
debug.append(value); |
253 | 260 |
} |
... | ... | |
256 | 263 |
columnIndex++; |
257 | 264 |
} |
258 | 265 |
debug.append(")"); |
259 |
logger.debug(debug.toString());
|
|
266 |
LOGGER.debug(debug.toString());
|
|
260 | 267 |
} catch(Exception ex) { |
261 | 268 |
} |
262 | 269 |
} |
Also available in: Unified diff