[oracle] Ensure that all attributes required for order by are fetched

nyalldawson · nyalldawson · commit 15d2b36839df · 2018-05-25T09:18:19.000+10:00
Fixes potentially broken iterator sorting with oracle provider when a subset of attributes is fetched (cherry-picked from 89a84f0)
diff --git a/src/providers/oracle/qgsoraclefeatureiterator.cpp b/src/providers/oracle/qgsoraclefeatureiterator.cpp
@@ -57,6 +57,14 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource* sour
       }
     }
 
+    // ensure that all attributes required for order by are fetched
+    const QSet< QString > orderByAttributes = mRequest.orderBy().usedAttributes();
+  for ( const QString &attr : orderByAttributes )
+    {
+      int attrIndex = mSource->mFields.fieldNameIndex( attr );
+      if ( !mAttributeList.contains( attrIndex ) )
+        mAttributeList << attrIndex;
+    }
   }
   else
     mAttributeList = mSource->mFields.allAttributesList();

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,14 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource* sour`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
	`60`	`+ // ensure that all attributes required for order by are fetched`
	`61`	`+ const QSet< QString > orderByAttributes = mRequest.orderBy().usedAttributes();`
	`62`	`+ for ( const QString &attr : orderByAttributes )`
	`63`	`+ {`
	`64`	`+ int attrIndex = mSource->mFields.fieldNameIndex( attr );`
	`65`	`+ if ( !mAttributeList.contains( attrIndex ) )`
	`66`	`+ mAttributeList << attrIndex;`
	`67`	`+ }`
`60`	`68`	`}`
`61`	`69`	`else`
`62`	`70`	`mAttributeList = mSource->mFields.allAttributesList();`