Merge pull request #3166 from nirvn/fix_processing_refactor_fields

[processing] fix missing quotes to field name in refactor fields
This commit is contained in:
Alexander Bruy 2016-06-10 10:59:00 +03:00 committed by GitHub
commit 895b9558b5

View File

@ -220,7 +220,7 @@ class FieldsMappingModel(QAbstractTableModel):
'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 @@ class FieldDelegate(QStyledItemDelegate):
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)