Prefix joined field with layer name to make conflict between attribut…

…es with the same name less likely
qgis · Aug 14, 2012 · 664973866f26a53ac56c7e4395b66c8b0dbfb0a6 · 6649738
1 parent 3f4df9f
commit 664973866f26a53ac56c7e4395b66c8b0dbfb0a6
Showing with 3 additions and 1 deletion.

+3 −1 src/core/qgsvectorlayerjoinbuffer.cpp
diff --git a/src/core/qgsvectorlayerjoinbuffer.cpp b/src/core/qgsvectorlayerjoinbuffer.cpp
@@ -99,7 +99,9 @@ void QgsVectorLayerJoinBuffer::updateFieldMap( QgsFieldMap& fields, int& maxInde
       //skip the join field to avoid double field names (fields often have the same name)
       if ( fieldIt.key() != joinIt->joinField )
       {
-        fields.insert( maxIndex + 1 + fieldIt.key(), fieldIt.value() );
+        QgsField f = fieldIt.value();
+        f.setName( joinLayer->name() + "_" + f.name() );
+        fields.insert( maxIndex + 1 + fieldIt.key(), f );
       }
     }