|
 |
cd34dd3 |
From 30449e577f0cd432bd8c60787743fba54c1e51b9 Mon Sep 17 00:00:00 2001
|
|
|
cd34dd3 |
From: Nyall Dawson <nyall.dawson@gmail.com>
|
|
|
cd34dd3 |
Date: Thu, 3 Mar 2016 10:34:32 +1100
|
|
|
cd34dd3 |
Subject: [PATCH] Fix fetching subset of attributes with mssql (fix #14402),
|
|
|
cd34dd3 |
add test
|
|
|
cd34dd3 |
|
|
|
cd34dd3 |
---
|
|
|
cd34dd3 |
src/providers/mssql/qgsmssqlfeatureiterator.cpp | 2 +-
|
|
|
cd34dd3 |
tests/src/python/providertestbase.py | 11 +++++++++++
|
|
|
cd34dd3 |
2 files changed, 12 insertions(+), 1 deletion(-)
|
|
|
cd34dd3 |
|
|
|
cd34dd3 |
diff --git a/src/providers/mssql/qgsmssqlfeatureiterator.cpp b/src/providers/mssql/qgsmssqlfeatureiterator.cpp
|
|
|
cd34dd3 |
index 53214d4..560d344 100644
|
|
|
cd34dd3 |
--- a/src/providers/mssql/qgsmssqlfeatureiterator.cpp
|
|
|
cd34dd3 |
+++ b/src/providers/mssql/qgsmssqlfeatureiterator.cpp
|
|
|
cd34dd3 |
@@ -284,7 +284,7 @@ bool QgsMssqlFeatureIterator::fetchFeature( QgsFeature& feature )
|
|
|
cd34dd3 |
for ( int i = 0; i < mAttributesToFetch.count(); i++ )
|
|
|
cd34dd3 |
{
|
|
|
cd34dd3 |
QVariant v = mQuery->value( i );
|
|
|
cd34dd3 |
- const QgsField &fld = mSource->mFields.at( i );
|
|
|
cd34dd3 |
+ const QgsField &fld = mSource->mFields.at( mAttributesToFetch.at( i ) );
|
|
|
cd34dd3 |
if ( v.type() != fld.type() )
|
|
|
cd34dd3 |
v = QgsVectorDataProvider::convertValue( fld.type(), v.toString() );
|
|
|
cd34dd3 |
feature.setAttribute( mAttributesToFetch.at( i ), v );
|
|
|
cd34dd3 |
diff --git a/tests/src/python/providertestbase.py b/tests/src/python/providertestbase.py
|
|
|
cd34dd3 |
index 7b8707e..26e6d86 100644
|
|
|
cd34dd3 |
--- a/tests/src/python/providertestbase.py
|
|
|
cd34dd3 |
+++ b/tests/src/python/providertestbase.py
|
|
|
cd34dd3 |
@@ -384,3 +384,14 @@ def testClosedIterators(self):
|
|
|
cd34dd3 |
|
|
|
cd34dd3 |
# Test rewinding closed iterator
|
|
|
cd34dd3 |
self.assertFalse(f_it.rewind(), 'Rewinding closed iterator successful, should not be allowed')
|
|
|
cd34dd3 |
+
|
|
|
cd34dd3 |
+ def testGetFeaturesSubsetAttributes(self):
|
|
|
cd34dd3 |
+ """ Test that expected results are returned when using subsets of attributes """
|
|
|
cd34dd3 |
+
|
|
|
cd34dd3 |
+ tests = {'pk': set([1, 2, 3, 4, 5]),
|
|
|
cd34dd3 |
+ 'cnt': set([-200, 300, 100, 200, 400]),
|
|
|
cd34dd3 |
+ 'name': set(['Pear', 'Orange', 'Apple', 'Honey', NULL]),
|
|
|
cd34dd3 |
+ 'name2': set(['NuLl', 'PEaR', 'oranGe', 'Apple', 'Honey'])}
|
|
|
cd34dd3 |
+ for field, expected in tests.iteritems():
|
|
|
cd34dd3 |
+ result = set([f[field] for f in self.provider.getFeatures(QgsFeatureRequest().setSubsetOfAttributes([field], self.provider.fields()))])
|
|
|
cd34dd3 |
+ self.assertEqual(result, expected, 'Expected {}, got {}'.format(expected, result))
|