Skip to content

Commit

Permalink
oracle provider: fix dfc2cf0 (fixes #13005; take II)
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jun 26, 2015
1 parent 8a54182 commit 318137a
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions src/providers/oracle/qgsoraclefeatureiterator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,9 @@ bool QgsOracleFeatureIterator::fetchFeature( QgsFeature& feature )

feature.setGeometryAndOwnership( copy, ba->size() );

if ( !mConnection->hasSpatial() &&
mRequest.filterType() == QgsFeatureRequest::FilterRect &&
( mRequest.flags() & QgsFeatureRequest::ExactIntersect ) != 0 &&
( !feature.geometry() || !feature.geometry()->intersects( mRequest.filterRect() ) ) )
if (( mRequest.flags() & QgsFeatureRequest::ExactIntersect ) != 0 && ( !mConnection->hasSpatial() || !mSource->mHasSpatialIndex ) &&
mRequest.filterType() == QgsFeatureRequest::FilterRect &&
( !feature.geometry() || !feature.geometry()->intersects( mRequest.filterRect() ) ) )
{
// skip feature that don't intersect with our rectangle
QgsDebugMsg( "no intersect" );
Expand Down

0 comments on commit 318137a

Please sign in to comment.