Merge pull request #5638 from pblottiere/bugfix_joins

pblottiere · web-flow · commit 5945a84d2159 · 2017-11-22T08:32:13.000Z
[bugfix] Fixes #17450 by correctly setting the join info ordered list
diff --git a/src/core/qgsvectorlayerfeatureiterator.cpp b/src/core/qgsvectorlayerfeatureiterator.cpp
@@ -722,12 +722,11 @@ void QgsVectorLayerFeatureIterator::createOrderedJoinList()
       int joinField = mOrderedJoinInfoList.at( i ).joinField;
 
       QgsAttributeList attributes = mOrderedJoinInfoList.at( i ).attributes;
-      QgsAttributeList::const_iterator attIt = attributes.constBegin();
-      for ( ; attIt != attributes.constEnd(); ++attIt )
+      for ( int n = 0; n < attributes.size(); n++ )
       {
-        if ( *attIt != joinField )
+        if ( n != joinField )
         {
-          resolvedFields.insert( joinField < *attIt ? *attIt + offset - 1 : *attIt + offset );
+          resolvedFields.insert( joinField < n ? n + offset - 1 : n + offset );
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -722,12 +722,11 @@ void QgsVectorLayerFeatureIterator::createOrderedJoinList()`
`722`	`722`	`int joinField = mOrderedJoinInfoList.at( i ).joinField;`
`723`	`723`
`724`	`724`	`QgsAttributeList attributes = mOrderedJoinInfoList.at( i ).attributes;`
`725`		`- QgsAttributeList::const_iterator attIt = attributes.constBegin();`
`726`		`- for ( ; attIt != attributes.constEnd(); ++attIt )`
	`725`	`+ for ( int n = 0; n < attributes.size(); n++ )`
`727`	`726`	`{`
`728`		`- if ( *attIt != joinField )`
	`727`	`+ if ( n != joinField )`
`729`	`728`	`{`
`730`		`- resolvedFields.insert( joinField < attIt ? attIt + offset - 1 : *attIt + offset );`
	`729`	`+ resolvedFields.insert( joinField < n ? n + offset - 1 : n + offset );`
`731`	`730`	`}`
`732`	`731`	`}`
`733`	`732`	`}`