postgres provider: also cast geography to geometry when using && (fixes #8572)

jef-n · jef-n · commit 90b3efb93dd0 · 2015-06-26T16:55:51.000+02:00
diff --git a/src/providers/postgres/qgspostgresfeatureiterator.cpp b/src/providers/postgres/qgspostgresfeatureiterator.cpp
@@ -289,14 +289,14 @@ QString QgsPostgresFeatureIterator::whereClauseRect()
            .arg( mSource->mRequestedSrid.isEmpty() ? mSource->mDetectedSrid : mSource->mRequestedSrid );
   }
 
+  bool castToGeometry = mSource->mSpatialColType == sctGeography ||
+                        mSource->mSpatialColType == sctPcPatch;
+
   QString whereClause = QString( "%1%2 && %3" )
                         .arg( QgsPostgresConn::quotedIdentifier( mSource->mGeometryColumn ) )
-                        .arg( mSource->mSpatialColType == sctPcPatch ? "::geometry" : "" )
+                        .arg( castToGeometry ? "::geometry" : "" )
                         .arg( qBox );
 
-  bool castToGeometry = mSource->mSpatialColType == sctGeography ||
-                        mSource->mSpatialColType == sctPcPatch;
-
   if ( mRequest.flags() & QgsFeatureRequest::ExactIntersect )
   {
     QString curveToLineFn; // in postgis < 1.5 the st_curvetoline function does not exist
