Merge pull request #3166 from nirvn/fix_processing_refactor_fields

[processing] fix missing quotes to field name in refactor fields
qgis · Jun 10, 2016 · 895b955 · 895b955
2 parents 37598bd + 14342ce
commit 895b955
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/python/plugins/processing/algs/qgis/ui/FieldsMappingPanel.py b/python/plugins/processing/algs/qgis/ui/FieldsMappingPanel.py
@@ -220,7 +220,7 @@ def newField(self, field=None):
                 'type': field.type(),
                 'length': field.length(),
                 'precision': field.precision(),
-                'expression': field.name()}
+                'expression': QgsExpression.quotedColumnRef(field.name())}
 
     def loadLayerFields(self, layer):
         self.beginResetModel()
@@ -292,7 +292,10 @@ def setModelData(self, editor, model, index):
 
         elif fieldType == QgsExpression:
             (value, isExpression, isValid) = editor.currentField()
-            model.setData(index, value)
+            if isExpression is True:
+                model.setData(index, value)
+            else:
+                model.setData(index, QgsExpression.quotedColumnRef(value))
 
         else:
             QStyledItemDelegate.setModelData(self, editor, model, index)