Fix text encoding in request filter expression

Author: Hugo Mercier

src/providers/ogr/qgsogrfeatureiterator.cpp

@@ -94,7 +94,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource* source, bool
     if ( result == QgsSqlExpressionCompiler::Complete || result == QgsSqlExpressionCompiler::Partial )
     {
       QString whereClause = compiler.result();
-      if ( OGR_L_SetAttributeFilter( ogrLayer, whereClause.toLocal8Bit().data() ) == OGRERR_NONE )
+      if ( OGR_L_SetAttributeFilter( ogrLayer, mSource->mEncoding->fromUnicode( whereClause ).constData() ) == OGRERR_NONE )
       {
         //if only partial success when compiling expression, we need to double-check results using QGIS' expressions
         mExpressionCompiled = ( result == QgsSqlExpressionCompiler::Complete );

tests/src/python/test_qgsfeatureiterator.py

@@ -57,6 +57,22 @@ def test_FilterExpression(self):
         myMessage = '\nExpected: {0} features\nGot: {1} features'.format(repr(expectedIds), repr(ids))
         assert ids == expectedIds, myMessage
 
+    def test_FilterExpressionWithAccents(self):
+        myShpFile = os.path.join(TEST_DATA_DIR, 'france_parts.shp')
+        layer = QgsVectorLayer(myShpFile, 'poly', 'ogr')
+
+        layer.setProviderEncoding("ISO-8859-1")
+        ids = [feat.id() for feat in layer.getFeatures(QgsFeatureRequest().setFilterExpression(u"TYPE_1 = 'Région'"))]
+        expectedIds = [0, 1, 2, 3]
+        myMessage = '\nExpected: {0} features\nGot: {1} features'.format(repr(expectedIds), repr(ids))
+        assert ids == expectedIds, myMessage
+
+        layer.setProviderEncoding("UTF-8")
+        ids = [feat.id() for feat in layer.getFeatures(QgsFeatureRequest().setFilterExpression(u"TYPE_1 = 'Région'"))]
+        expectedIds = []
+        myMessage = '\nExpected: {0} features\nGot: {1} features'.format(repr(expectedIds), repr(ids))
+        assert ids == expectedIds, myMessage
+
     def test_FilterFids(self):
         # create point layer
         myShpFile = os.path.join(TEST_DATA_DIR, 'points.shp')