Fix fetching subset of attributes with mssql (fix #14402), add test

nyalldawson · nyalldawson · commit 63d6f7b4f8af · 2016-03-03T11:31:14.000+11:00
(cherry-picked from 30449e5)
diff --git a/src/providers/mssql/qgsmssqlfeatureiterator.cpp b/src/providers/mssql/qgsmssqlfeatureiterator.cpp
@@ -284,7 +284,7 @@ bool QgsMssqlFeatureIterator::fetchFeature( QgsFeature& feature )
     for ( int i = 0; i < mAttributesToFetch.count(); i++ )
     {
       QVariant v = mQuery->value( i );
-      const QgsField &fld = mSource->mFields.at( i );
+      const QgsField &fld = mSource->mFields.at( mAttributesToFetch.at( i ) );
       if ( v.type() != fld.type() )
         v = QgsVectorDataProvider::convertValue( fld.type(), v.toString() );
       feature.setAttribute( mAttributesToFetch.at( i ), v );
diff --git a/tests/src/python/providertestbase.py b/tests/src/python/providertestbase.py
@@ -384,3 +384,14 @@ def testClosedIterators(self):
 
         # Test rewinding closed iterator
         self.assertFalse(f_it.rewind(), 'Rewinding closed iterator successful, should not be allowed')
+
+    def testGetFeaturesSubsetAttributes(self):
+        """ Test that expected results are returned when using subsets of attributes """
+
+        tests = {'pk': set([1, 2, 3, 4, 5]),
+                 'cnt': set([-200, 300, 100, 200, 400]),
+                 'name': set(['Pear', 'Orange', 'Apple', 'Honey', NULL]),
+                 'name2': set(['NuLl', 'PEaR', 'oranGe', 'Apple', 'Honey'])}
+        for field, expected in tests.iteritems():
+            result = set([f[field] for f in self.provider.getFeatures(QgsFeatureRequest().setSubsetOfAttributes([field], self.provider.fields()))])
+            self.assertEqual(result, expected, 'Expected {}, got {}'.format(expected, result))

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ bool QgsMssqlFeatureIterator::fetchFeature( QgsFeature& feature )`
`284`	`284`	`for ( int i = 0; i < mAttributesToFetch.count(); i++ )`
`285`	`285`	`{`
`286`	`286`	`QVariant v = mQuery->value( i );`
`287`		`- const QgsField &fld = mSource->mFields.at( i );`
	`287`	`+ const QgsField &fld = mSource->mFields.at( mAttributesToFetch.at( i ) );`
`288`	`288`	`if ( v.type() != fld.type() )`
`289`	`289`	`v = QgsVectorDataProvider::convertValue( fld.type(), v.toString() );`
`290`	`290`	`feature.setAttribute( mAttributesToFetch.at( i ), v );`