Skip to content

Commit c5c22d3

Browse files
committedMay 3, 2018
[oracle] Always fetch features with null goemetry unless feature rect is set
...to match behaviour of other providers (cherry-picked from a74414c)
1 parent 5709908 commit c5c22d3

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed
 

‎src/providers/oracle/qgsoraclefeatureiterator.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,13 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource *sour
172172
if ( !whereClause.isEmpty() )
173173
whereClause += QStringLiteral( " AND " );
174174

175+
whereClause += '(';
176+
175177
whereClause += QgsOracleConn::databaseTypeFilter( QStringLiteral( "FEATUREREQUEST" ), mSource->mGeometryColumn, mSource->mRequestedGeomType );
178+
179+
if ( mFilterRect.isNull() )
180+
whereClause += QStringLiteral( " OR %1 IS NULL" ).arg( mSource->mGeometryColumn );
181+
whereClause += ')';
176182
}
177183

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

0 commit comments

Comments
 (0)
Please sign in to comment.