Skip to content
Permalink
Browse files

oracle provider: handle NULL geometry in case of multiple geometry co…

…lumns
  • Loading branch information
jef-n committed Apr 2, 2016
1 parent 59de73a commit c93187d78c49cada9bd6d554d171d640a53f72a8
Showing with 13 additions and 6 deletions.
  1. +13 −6 src/providers/oracle/qgsoraclefeatureiterator.cpp
@@ -275,13 +275,20 @@ bool QgsOracleFeatureIterator::fetchFeature( QgsFeature& feature )
if ( fld.type() == QVariant::ByteArray && fld.typeName().endsWith( ".SDO_GEOMETRY" ) )
{
QByteArray *ba = static_cast<QByteArray*>( v.data() );
unsigned char *copy = new unsigned char[ba->size()];
memcpy( copy, ba->constData(), ba->size() );
if ( ba->size() > 0 )
{
unsigned char *copy = new unsigned char[ba->size()];
memcpy( copy, ba->constData(), ba->size() );

QgsGeometry *g = new QgsGeometry();
g->fromWkb( copy, ba->size() );
v = g->exportToWkt();
delete g;
QgsGeometry *g = new QgsGeometry();
g->fromWkb( copy, ba->size() );
v = g->exportToWkt();
delete g;
}
else
{
v = QVariant( QVariant::String );
}
}
else if ( v.type() != fld.type() )
v = QgsVectorDataProvider::convertValue( fld.type(), v.toString() );

0 comments on commit c93187d

Please sign in to comment.
You can’t perform that action at this time.