Fix shifted joined attributes when join field is repeated (fixes #12589)

wonder-sk · wonder-sk · commit 5c2f9e675566 · 2015-07-07T18:06:16.000+02:00
(cherry picked from commit 7870815)
diff --git a/src/core/qgsvectorlayerjoinbuffer.cpp b/src/core/qgsvectorlayerjoinbuffer.cpp
@@ -237,7 +237,8 @@ void QgsVectorLayerJoinBuffer::updateFields( QgsFields& fields )
         continue;
 
       //skip the join field to avoid double field names (fields often have the same name)
-      if ( joinFields[idx].name() != joinFieldName )
+      // when using subset of field, use all the selected fields
+      if ( hasSubset || joinFields[idx].name() != joinFieldName )
       {
         QgsField f = joinFields[idx];
         f.setName( prefix + f.name() );

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,8 @@ void QgsVectorLayerJoinBuffer::updateFields( QgsFields& fields )`
`237`	`237`	`continue;`
`238`	`238`
`239`	`239`	`//skip the join field to avoid double field names (fields often have the same name)`
`240`		`- if ( joinFields[idx].name() != joinFieldName )`
	`240`	`+ // when using subset of field, use all the selected fields`
	`241`	`+ if ( hasSubset \|\| joinFields[idx].name() != joinFieldName )`
`241`	`242`	`{`
`242`	`243`	`QgsField f = joinFields[idx];`
`243`	`244`	`f.setName( prefix + f.name() );`