Fix virtual layers fail if table field names have special characters

nyalldawson · nyalldawson · commit d95fc60b048f · 2018-01-19T14:51:51.000+10:00
Fixes #16943 Cherry-picked from 6c39212
diff --git a/src/providers/virtual/qgsvirtuallayersqlitemodule.cpp b/src/providers/virtual/qgsvirtuallayersqlitemodule.cpp
@@ -215,7 +215,7 @@ struct VTable
           typeName = "text";
           break;
       }
-      sqlFields << field.name() + " " + typeName;
+      sqlFields << QString( "\"%1\" %2" ).arg( field.name(), typeName );
     }
 
     QgsVectorDataProvider* provider = mLayer ? mLayer->dataProvider() : mProvider;
diff --git a/tests/src/python/test_provider_virtual.py b/tests/src/python/test_provider_virtual.py
@@ -16,6 +16,7 @@
 import os
 
 from qgis.core import (QgsVectorLayer,
+                       QgsField,
                        QgsFeature,
                        QgsFeatureRequest,
                        QgsGeometry,
@@ -841,6 +842,29 @@ def test_joined_layers_conversion(self):
 
         QgsMapLayerRegistry.instance().removeMapLayers([v1, v2, v3])
 
+    def testFieldsWithSpecialCharacters(self):
+        ml = QgsVectorLayer("Point?srid=EPSG:4326&field=123:int", "mem_with_nontext_fieldnames", "memory")
+        self.assertEqual(ml.isValid(), True)
+        QgsMapLayerRegistry.instance().addMapLayer(ml)
+
+        ml.startEditing()
+        self.assertTrue(ml.addAttribute(QgsField('abc:123', QVariant.String)))
+        f1 = QgsFeature(ml.fields())
+        f1.setGeometry(QgsGeometry.fromWkt('POINT(0 0)'))
+        f2 = QgsFeature(ml.fields())
+        f2.setGeometry(QgsGeometry.fromWkt('POINT(1 1)'))
+        ml.addFeatures([f1, f2])
+        ml.commitChanges()
+
+        vl = QgsVectorLayer("?query=select * from mem_with_nontext_fieldnames", "vl", "virtual")
+        self.assertEqual(vl.isValid(), True)
+        self.assertEqual(vl.fields().at(0).name(), '123')
+        self.assertEqual(vl.fields().at(1).name(), 'abc:123')
+
+        self.assertEqual(vl.featureCount(), 2)
+
+        QgsMapLayerRegistry.instance().removeMapLayer(ml)
+
 
 if __name__ == '__main__':
     unittest.main()

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ struct VTable`
`215`	`215`	`typeName = "text";`
`216`	`216`	`break;`
`217`	`217`	`}`
`218`		`- sqlFields << field.name() + " " + typeName;`
	`218`	`+ sqlFields << QString( "\"%1\" %2" ).arg( field.name(), typeName );`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`QgsVectorDataProvider* provider = mLayer ? mLayer->dataProvider() : mProvider;`