Skip to content
Permalink
Browse files

[oracle] Always fetch features with null goemetry unless feature rect…

… is set

...to match behaviour of other providers

(cherry-picked from c5c22d3)
  • Loading branch information
nyalldawson committed Apr 21, 2018
1 parent bacaee4 commit 29e80baac27e87ec8698d6cb5b9fce204c4721a3
Showing with 6 additions and 0 deletions.
  1. +6 −0 src/providers/oracle/qgsoraclefeatureiterator.cpp
@@ -160,7 +160,13 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource* sour
if ( !whereClause.isEmpty() )
whereClause += " AND ";

whereClause += '(';

whereClause += QgsOracleConn::databaseTypeFilter( "FEATUREREQUEST", mSource->mGeometryColumn, mSource->mRequestedGeomType );

if ( mRequest.filterRect().isNull() )
whereClause += QString( " OR %1 IS NULL" ).arg( mSource->mGeometryColumn );
whereClause += ')';
}

if ( !mSource->mSqlWhereClause.isEmpty() )

0 comments on commit 29e80ba

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