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

… is set ...to match behaviour of other providers (cherry-picked from c5c22d3)
qgis · May 24, 2018 · 29e80ba · 29e80ba
1 parent bacaee4
commit 29e80ba
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/providers/oracle/qgsoraclefeatureiterator.cpp b/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() )