oracle spatial: use sdo_relate for exact intersect feature requests where oracle spatial is available

jef-n · jef-n · commit 0beeadf9066a · 2015-04-26T15:24:56.000+02:00
(cherry picked from commit fa99a96)
diff --git a/src/providers/oracle/qgsoraclefeatureiterator.cpp b/src/providers/oracle/qgsoraclefeatureiterator.cpp
@@ -66,14 +66,13 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource* sour
                        .arg( qgsDoubleToString( rect.yMaximum() ) );
 
         whereClause = QString( "sdo_filter(%1,%2)='TRUE'" ).arg( QgsOracleProvider::quotedIdentifier( mSource->mGeometryColumn ) ).arg( bbox );
-#if 0
-        if ( mRequest.flags() & QgsFeatureRequest::ExactIntersect )
+
+        if ( mRequest.flags() & QgsFeatureRequest::ExactIntersect && mConnection->hasSpatial() )
         {
           whereClause += QString( " AND sdo_relate(%1,%2,'mask=ANYINTERACT')='TRUE'" )
-                         .arg( quotedIdentifier( P->mGeometryColumn ) )
+                         .arg( QgsOracleProvider::quotedIdentifier( mSource->mGeometryColumn ) )
                          .arg( bbox );
         }
-#endif
       }
       break;
 

Original file line number	Diff line number	Diff line change
`@@ -66,14 +66,13 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource* sour`
`66`	`66`	`.arg( qgsDoubleToString( rect.yMaximum() ) );`
`67`	`67`
`68`	`68`	`whereClause = QString( "sdo_filter(%1,%2)='TRUE'" ).arg( QgsOracleProvider::quotedIdentifier( mSource->mGeometryColumn ) ).arg( bbox );`
`69`		`-#if 0`
`70`		`- if ( mRequest.flags() & QgsFeatureRequest::ExactIntersect )`
	`69`	`+`
	`70`	`+ if ( mRequest.flags() & QgsFeatureRequest::ExactIntersect && mConnection->hasSpatial() )`
`71`	`71`	`{`
`72`	`72`	`whereClause += QString( " AND sdo_relate(%1,%2,'mask=ANYINTERACT')='TRUE'" )`
`73`		`- .arg( quotedIdentifier( P->mGeometryColumn ) )`
	`73`	`+ .arg( QgsOracleProvider::quotedIdentifier( mSource->mGeometryColumn ) )`
`74`	`74`	`.arg( bbox );`
`75`	`75`	`}`
`76`		`-#endif`
`77`	`76`	`}`
`78`	`77`	`break;`
`79`	`78`