spatialite: update more infinite where clauses (followup 371f9ba)

jef-n · jef-n · commit eabfa4800b88 · 2013-11-14T00:52:48.000+01:00
diff --git a/src/providers/spatialite/qgsspatialitefeatureiterator.cpp b/src/providers/spatialite/qgsspatialitefeatureiterator.cpp
@@ -221,9 +221,9 @@ QString QgsSpatiaLiteFeatureIterator::whereClauseRect()
     // handling a VirtualShape layer
     whereClause += QString( "MbrIntersects(%1, BuildMbr(%2))" ).arg( P->quotedIdentifier( P->mGeometryColumn ) ).arg( mbr( rect ) );
   }
-  else
+  else if ( rect.isFinite() )
   {
-    if ( P->spatialIndexRTree && rect.isFinite() )
+    if ( P->spatialIndexRTree )
     {
       // using the RTree spatial index
       QString mbrFilter = QString( "xmin <= %1 AND " ).arg( qgsDoubleToString( rect.xMaximum() ) );
@@ -251,6 +251,10 @@ QString QgsSpatiaLiteFeatureIterator::whereClauseRect()
       whereClause += QString( "MbrIntersects(%1, BuildMbr(%2))" ).arg( P->quotedIdentifier( P->mGeometryColumn ) ).arg( mbr( rect ) );
     }
   }
+  else
+  {
+    whereClause = "1";
+  }
   return whereClause;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -221,9 +221,9 @@ QString QgsSpatiaLiteFeatureIterator::whereClauseRect()`
`221`	`221`	`// handling a VirtualShape layer`
`222`	`222`	`whereClause += QString( "MbrIntersects(%1, BuildMbr(%2))" ).arg( P->quotedIdentifier( P->mGeometryColumn ) ).arg( mbr( rect ) );`
`223`	`223`	`}`
`224`		`- else`
	`224`	`+ else if ( rect.isFinite() )`
`225`	`225`	`{`
`226`		`- if ( P->spatialIndexRTree && rect.isFinite() )`
	`226`	`+ if ( P->spatialIndexRTree )`
`227`	`227`	`{`
`228`	`228`	`// using the RTree spatial index`
`229`	`229`	`QString mbrFilter = QString( "xmin <= %1 AND " ).arg( qgsDoubleToString( rect.xMaximum() ) );`
`@@ -251,6 +251,10 @@ QString QgsSpatiaLiteFeatureIterator::whereClauseRect()`
`251`	`251`	`whereClause += QString( "MbrIntersects(%1, BuildMbr(%2))" ).arg( P->quotedIdentifier( P->mGeometryColumn ) ).arg( mbr( rect ) );`
`252`	`252`	`}`
`253`	`253`	`}`
	`254`	`+ else`
	`255`	`+ {`
	`256`	`+ whereClause = "1";`
	`257`	`+ }`
`254`	`258`	`return whereClause;`
`255`	`259`	`}`
`256`	`260`