Merge pull request #2416 from elpaso/bugfix-13747

elpaso · elpaso · commit 60c591d3a571 · 2015-11-03T20:17:30.000+01:00
Fixes #13747
diff --git a/src/providers/spatialite/qgsspatialitefeatureiterator.cpp b/src/providers/spatialite/qgsspatialitefeatureiterator.cpp
@@ -34,31 +34,46 @@ QgsSpatiaLiteFeatureIterator::QgsSpatiaLiteFeatureIterator( QgsSpatiaLiteFeature
   mHasPrimaryKey = !mSource->mPrimaryKey.isEmpty();
   mRowNumber = 0;
 
+  QStringList whereClauses;
   QString whereClause;
   if ( !request.filterRect().isNull() && !mSource->mGeometryColumn.isNull() )
   {
     // some kind of MBR spatial filtering is required
-    whereClause += whereClauseRect();
+    whereClause = whereClauseRect();
+    if ( ! whereClause.isEmpty() )
+    {
+      whereClauses.append( whereClause );
+    }
   }
 
   if ( request.filterType() == QgsFeatureRequest::FilterFid )
   {
-    whereClause += whereClauseFid();
+    whereClause = whereClauseFid();
+    if ( ! whereClause.isEmpty() )
+    {
+      whereClauses.append( whereClause );
+    }
   }
   else if ( request.filterType() == QgsFeatureRequest::FilterFids )
   {
-    whereClause += whereClauseFids();
+    whereClause = whereClauseFids();
+    if ( ! whereClause.isEmpty() )
+    {
+      whereClauses.append( whereClause );
+    }
   }
 
   if ( !mSource->mSubsetString.isEmpty() )
   {
-    if ( !whereClause.isEmpty() )
+    whereClause = "( " + mSource->mSubsetString + ')';
+    if ( ! whereClause.isEmpty() )
     {
-      whereClause += " AND ";
+      whereClauses.append( whereClause );
     }
-    whereClause += "( " + mSource->mSubsetString + ')';
   }
 
+  whereClause = whereClauses.join( " AND " );
+
   // preparing the SQL statement
   if ( !prepareStatement( whereClause ) )
   {

Original file line number	Diff line number	Diff line change
`@@ -34,31 +34,46 @@ QgsSpatiaLiteFeatureIterator::QgsSpatiaLiteFeatureIterator( QgsSpatiaLiteFeature`
`34`	`34`	`mHasPrimaryKey = !mSource->mPrimaryKey.isEmpty();`
`35`	`35`	`mRowNumber = 0;`
`36`	`36`
	`37`	`+ QStringList whereClauses;`
`37`	`38`	`QString whereClause;`
`38`	`39`	`if ( !request.filterRect().isNull() && !mSource->mGeometryColumn.isNull() )`
`39`	`40`	`{`
`40`	`41`	`// some kind of MBR spatial filtering is required`
`41`		`- whereClause += whereClauseRect();`
	`42`	`+ whereClause = whereClauseRect();`
	`43`	`+ if ( ! whereClause.isEmpty() )`
	`44`	`+ {`
	`45`	`+ whereClauses.append( whereClause );`
	`46`	`+ }`
`42`	`47`	`}`
`43`	`48`
`44`	`49`	`if ( request.filterType() == QgsFeatureRequest::FilterFid )`
`45`	`50`	`{`
`46`		`- whereClause += whereClauseFid();`
	`51`	`+ whereClause = whereClauseFid();`
	`52`	`+ if ( ! whereClause.isEmpty() )`
	`53`	`+ {`
	`54`	`+ whereClauses.append( whereClause );`
	`55`	`+ }`
`47`	`56`	`}`
`48`	`57`	`else if ( request.filterType() == QgsFeatureRequest::FilterFids )`
`49`	`58`	`{`
`50`		`- whereClause += whereClauseFids();`
	`59`	`+ whereClause = whereClauseFids();`
	`60`	`+ if ( ! whereClause.isEmpty() )`
	`61`	`+ {`
	`62`	`+ whereClauses.append( whereClause );`
	`63`	`+ }`
`51`	`64`	`}`
`52`	`65`
`53`	`66`	`if ( !mSource->mSubsetString.isEmpty() )`
`54`	`67`	`{`
`55`		`- if ( !whereClause.isEmpty() )`
	`68`	`+ whereClause = "( " + mSource->mSubsetString + ')';`
	`69`	`+ if ( ! whereClause.isEmpty() )`
`56`	`70`	`{`
`57`		`- whereClause += " AND ";`
	`71`	`+ whereClauses.append( whereClause );`
`58`	`72`	`}`
`59`		`- whereClause += "( " + mSource->mSubsetString + ')';`
`60`	`73`	`}`
`61`	`74`
	`75`	`+ whereClause = whereClauses.join( " AND " );`
	`76`	`+`
`62`	`77`	`// preparing the SQL statement`
`63`	`78`	`if ( !prepareStatement( whereClause ) )`
`64`	`79`	`{`