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

… is set ...to match behaviour of other providers
qgis · Apr 21, 2018 · a74414c · a74414c
1 parent dd2ff15
commit a74414c
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/providers/oracle/qgsoraclefeatureiterator.cpp b/src/providers/oracle/qgsoraclefeatureiterator.cpp
@@ -172,7 +172,13 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource *sour
     if ( !whereClause.isEmpty() )
       whereClause += QStringLiteral( " AND " );
 
+    whereClause += '(';
+
     whereClause += QgsOracleConn::databaseTypeFilter( QStringLiteral( "FEATUREREQUEST" ), mSource->mGeometryColumn, mSource->mRequestedGeomType );
+
+    if ( mFilterRect.isNull() )
+      whereClause += QStringLiteral( " OR %1 IS NULL" ).arg( mSource->mGeometryColumn );
+    whereClause += ')';
   }
 
   if ( !mSource->mSqlWhereClause.isEmpty() )