oracle provider: fix dfc2cf0 (fixes #13005; take II)

qgis · Jun 26, 2015 · 318137a · 318137a
1 parent 8a54182
commit 318137a
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/providers/oracle/qgsoraclefeatureiterator.cpp b/src/providers/oracle/qgsoraclefeatureiterator.cpp
@@ -145,10 +145,9 @@ bool QgsOracleFeatureIterator::fetchFeature( QgsFeature& feature )
 
       feature.setGeometryAndOwnership( copy, ba->size() );
 
-      if ( !mConnection->hasSpatial() &&
+      if (( mRequest.flags() & QgsFeatureRequest::ExactIntersect ) != 0 && ( !mConnection->hasSpatial() || !mSource->mHasSpatialIndex ) &&
-           mRequest.filterType() == QgsFeatureRequest::FilterRect &&
+          mRequest.filterType() == QgsFeatureRequest::FilterRect &&
-           ( mRequest.flags() & QgsFeatureRequest::ExactIntersect ) != 0 &&
+          ( !feature.geometry() || !feature.geometry()->intersects( mRequest.filterRect() ) ) )
-           ( !feature.geometry() || !feature.geometry()->intersects( mRequest.filterRect() ) ) )
       {
         // skip feature that don't intersect with our rectangle
         QgsDebugMsg( "no intersect" );