[processing]field calculator : allow creating field already present (…

…case insensitive equal) Fixes #40701 (cherry picked from commit 472b950)
qgis · Jan 15, 2021 · 5c886d3 · 5c886d3
1 parent 9ce4b8b
commit 5c886d3
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/analysis/processing/qgsalgorithmfieldcalculator.cpp b/src/analysis/processing/qgsalgorithmfieldcalculator.cpp
@@ -101,7 +101,7 @@ QgsFieldCalculatorAlgorithm *QgsFieldCalculatorAlgorithm::createInstance() const
 }
 
 
-bool QgsFieldCalculatorAlgorithm::prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback * )
+bool QgsFieldCalculatorAlgorithm::prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback )
 {
   std::unique_ptr< QgsProcessingFeatureSource > source( parameterAsSource( parameters, QStringLiteral( "INPUT" ), context ) );
 
@@ -131,10 +131,16 @@ bool QgsFieldCalculatorAlgorithm::prepareAlgorithm( const QVariantMap &parameter
 
   mFields = source->fields();
 
-  int fieldIdx = mFields.lookupField( field.name() );
+  int fieldIdx = mFields.indexFromName( field.name() );
 
   if ( fieldIdx < 0 )
+  {
     mFields.append( field );
+  }
+  else
+  {
+    feedback->pushWarning( QObject::tr( "Field name %1 already exists and will be replaced" ).arg( field.name() ) );
+  }
 
   QString dest;
 
@@ -205,4 +211,3 @@ bool QgsFieldCalculatorAlgorithm::supportInPlaceEdit( const QgsMapLayer *layer )
 }
 
 ///@endcond
-