[BUGFIX] [Oracle] Make QgsOracleFeatureIterator() robust to reference…

…s to non existing fields in filter expression and order by
qgis · Jan 21, 2020 · 58df76a · 58df76a
1 parent bf7dffe
commit 58df76a
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/src/providers/oracle/qgsoraclefeatureiterator.cpp b/src/providers/oracle/qgsoraclefeatureiterator.cpp
@@ -70,23 +70,22 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource *sour
     // ensure that all attributes required for expression filter are being fetched
     if ( mRequest.filterType() == QgsFeatureRequest::FilterExpression )
     {
-      const auto constReferencedColumns = mRequest.filterExpression()->referencedColumns();
+      const QSet<int> attributeIndexes = mRequest.filterExpression()->referencedAttributeIndexes( mSource->mFields );
-      for ( const QString &field : constReferencedColumns )
+      for ( int attrIdx : attributeIndexes )
       {
-        int attrIdx = mSource->mFields.lookupField( field );
         if ( !mAttributeList.contains( attrIdx ) )
           mAttributeList << attrIdx;
       }
     }
 
     // ensure that all attributes required for order by are fetched
-    const QSet< QString > orderByAttributes = mRequest.orderBy().usedAttributes();
+    const auto orderByAttributes = mRequest.orderBy().usedAttributeIndices( mSource->mFields );
-    for ( const QString &attr : orderByAttributes )
+    for ( int attrIdx : orderByAttributes )
     {
-      int attrIndex = mSource->mFields.lookupField( attr );
+      if ( !mAttributeList.contains( attrIdx ) )
-      if ( !mAttributeList.contains( attrIndex ) )
+        mAttributeList << attrIdx;
-        mAttributeList << attrIndex;
     }
+
   }
   else
     mAttributeList = mSource->mFields.allAttributesList();