Skip to content

Commit 29e80ba

Browse files
committed
[oracle] Always fetch features with null goemetry unless feature rect is set
...to match behaviour of other providers (cherry-picked from c5c22d3)
1 parent bacaee4 commit 29e80ba

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
@@ -160,7 +160,13 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource* sour
160160
if ( !whereClause.isEmpty() )
161161
whereClause += " AND ";
162162

163+
whereClause += '(';
164+
163165
whereClause += QgsOracleConn::databaseTypeFilter( "FEATUREREQUEST", mSource->mGeometryColumn, mSource->mRequestedGeomType );
166+
167+
if ( mRequest.filterRect().isNull() )
168+
whereClause += QString( " OR %1 IS NULL" ).arg( mSource->mGeometryColumn );
169+
whereClause += ')';
164170
}
165171

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

0 commit comments

Comments
 (0)