[memory] Fix provider cannot handle fields with complex characters in name

nyalldawson · nyalldawson · commit 1b263163baa6 · 2018-05-03T11:23:23.000+10:00
Fixes #18885 (cherry-picked from 9809f93)
diff --git a/src/core/providers/memory/qgsmemoryprovider.cpp b/src/core/providers/memory/qgsmemoryprovider.cpp
@@ -108,7 +108,7 @@ QgsMemoryProvider::QgsMemoryProvider( const QString &uri )
     QStringList fields = url.allQueryItemValues( QStringLiteral( "field" ) );
     for ( int i = 0; i < fields.size(); i++ )
     {
-      QString name = fields.at( i );
+      QString name = QUrl::fromPercentEncoding( fields.at( i ).toUtf8() );
       QVariant::Type type = QVariant::String;
       QVariant::Type subType = QVariant::Invalid;
       QString typeName( QStringLiteral( "string" ) );
diff --git a/src/core/providers/memory/qgsmemoryproviderutils.cpp b/src/core/providers/memory/qgsmemoryproviderutils.cpp
@@ -72,7 +72,7 @@ QgsVectorLayer *QgsMemoryProviderUtils::createMemoryLayer( const QString &name,
     {
       lengthPrecision = QStringLiteral( "(%1)" ).arg( field.length() );
     }
-    parts << QStringLiteral( "field=%1:%2%3" ).arg( field.name(), memoryLayerFieldType( field.type() ), lengthPrecision );
+    parts << QStringLiteral( "field=%1:%2%3" ).arg( QString( QUrl::toPercentEncoding( field.name() ) ), memoryLayerFieldType( field.type() ), lengthPrecision );
   }
 
   QString uri = geomType + '?' + parts.join( '&' );
diff --git a/tests/src/python/test_provider_memory.py b/tests/src/python/test_provider_memory.py
@@ -275,6 +275,16 @@ def testLengthPrecisionFromUri(self):
         self.assertEqual(myMemoryLayer.fields().field('size').length(), 12)
         self.assertEqual(myMemoryLayer.fields().field('size').precision(), 9)
 
+    def testFromUriWithEncodedField(self):
+        """Test we can construct the mem provider from a uri when a field name is encoded"""
+        layer = QgsVectorLayer(
+            ('Point?crs=epsg:4326&field=name:string(20)&'
+             'field=test%2Ffield:integer'),
+            'test',
+            'memory')
+        self.assertTrue(layer.isValid())
+        self.assertEqual([f.name() for f in layer.fields()], ['name', 'test/field'])
+
     def testSaveFields(self):
         # Create a new memory layer with no fields
         myMemoryLayer = QgsVectorLayer(
@@ -398,6 +408,8 @@ def testCreateMemoryLayer(self):
         fields.append(QgsField("date", QVariant.Date))
         fields.append(QgsField("datetime", QVariant.DateTime))
         fields.append(QgsField("time", QVariant.Time))
+        fields.append(QgsField("#complex_name", QVariant.String))
+        fields.append(QgsField("complex/name", QVariant.String))
         layer = QgsMemoryProviderUtils.createMemoryLayer('my name', fields)
         self.assertTrue(layer.isValid())
         self.assertFalse(layer.fields().isEmpty())

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ QgsMemoryProvider::QgsMemoryProvider( const QString &uri )`
`108`	`108`	`QStringList fields = url.allQueryItemValues( QStringLiteral( "field" ) );`
`109`	`109`	`for ( int i = 0; i < fields.size(); i++ )`
`110`	`110`	`{`
`111`		`- QString name = fields.at( i );`
	`111`	`+ QString name = QUrl::fromPercentEncoding( fields.at( i ).toUtf8() );`
`112`	`112`	`QVariant::Type type = QVariant::String;`
`113`	`113`	`QVariant::Type subType = QVariant::Invalid;`
`114`	`114`	`QString typeName( QStringLiteral( "string" ) );`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ QgsVectorLayer *QgsMemoryProviderUtils::createMemoryLayer( const QString &name,`
`72`	`72`	`{`
`73`	`73`	`lengthPrecision = QStringLiteral( "(%1)" ).arg( field.length() );`
`74`	`74`	`}`
`75`		`- parts << QStringLiteral( "field=%1:%2%3" ).arg( field.name(), memoryLayerFieldType( field.type() ), lengthPrecision );`
	`75`	`+ parts << QStringLiteral( "field=%1:%2%3" ).arg( QString( QUrl::toPercentEncoding( field.name() ) ), memoryLayerFieldType( field.type() ), lengthPrecision );`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`QString uri = geomType + '?' + parts.join( '&' );`