Revision 33331 branches/v2_0_0_prep/libraries/libFMap_daldb/src/org/gvsig/fmap/dal/store/postgresql/PostgreSQLStoreProvider.java

View differences:

PostgreSQLStoreProvider.java
216 216
			List<Object> values) throws DataException {
217 217

  
218 218
		super.addToListFeatureValues(featureProvider, attrOfList, attr, values);
219
		if (attr.getDataType() == DataTypes.GEOMETRY) {
219
		if (attr.getType() == DataTypes.GEOMETRY) {
220 220
			values.add(helper.getProviderSRID(attr.getSRS()));
221 221
		}
222 222
	}
......
224 224
	protected void prepareAttributeForInsert(
225 225
			FeatureAttributeDescriptor attr, List<String> fields, List<String> values) {
226 226

  
227
		if (attr.getDataType() == DataTypes.GEOMETRY) {
227
		if (attr.getType() == DataTypes.GEOMETRY) {
228 228
			fields.add(helper.escapeFieldName(attr.getName()));
229 229
			values.add("GeomFromWKB(?,?)");
230 230
		} else {
......
235 235

  
236 236
	protected void prepareAttributeForUpdate(FeatureAttributeDescriptor attr,
237 237
			List<String> values) {
238
		if (attr.getDataType() == DataTypes.GEOMETRY) {
238
		if (attr.getType() == DataTypes.GEOMETRY) {
239 239
			values.add(helper.escapeFieldName(attr.getName())
240 240
					+ " = GeomFromWKB(?,?)");
241 241
		} else {
......
245 245

  
246 246
	protected String getSqlStatementAddField(FeatureAttributeDescriptor attr,
247 247
			List<String> additionalStatement) throws DataException {
248
		if (attr.getDataType() == DataTypes.GEOMETRY) {
248
		if (attr.getType() == DataTypes.GEOMETRY) {
249 249
			PostgreSQLStoreParameters params = getPGParameters();
250 250
			additionalStatement.addAll(	((PostgreSQLHelper) helper)
251 251
					.getSqlGeometyFieldAdd(attr, params.getTable(), params
......
282 282
			List<String> additionalStatement) {
283 283
		String result = super.getSqlStatementDropField(attr,
284 284
				additionalStatement);
285
		if (attr.getDataType() == DataTypes.GEOMETRY) {
285
		if (attr.getType() == DataTypes.GEOMETRY) {
286 286
			additionalStatement.add(getSqlGeometyFieldDrop(attr));
287 287
		}
288 288
		return result;
......
297 297
				additionalStatement);
298 298
		PostgreSQLStoreParameters params = getPGParameters();
299 299
		if (attrOrg.getDataType() != attrTrg.getDataType()) {
300
			if (attrOrg.getDataType() == DataTypes.GEOMETRY) {
300
			if (attrOrg.getType() == DataTypes.GEOMETRY) {
301 301
				additionalStatement.add(getSqlGeometyFieldDrop(attrOrg));
302 302
			}
303
			if (attrTrg.getDataType() == DataTypes.GEOMETRY) {
303
			if (attrTrg.getType() == DataTypes.GEOMETRY) {
304 304
				additionalStatement.addAll(((PostgreSQLHelper) helper)
305 305
						.getSqlGeometyFieldAdd(attrTrg, params.getTable(),
306 306
								params.getSchema()));
307 307
			}
308 308
		}
309 309
		if (attrOrg.getDataType() == attrTrg.getDataType()
310
				&& attrTrg.getDataType() == DataTypes.GEOMETRY) {
310
				&& attrTrg.getType() == DataTypes.GEOMETRY) {
311 311
			// TODO Checks SRS and GeomType/Subtype
312 312
		}
313 313

  

Also available in: Unified diff