ogr provider: virtual format driver can also be named 'VRT' (fixes #11223)

jef-n · jef-n · commit 9a99d2f86fed · 2015-01-17T00:08:03.000+01:00
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -66,7 +66,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource* source, bool
   // unless it's a VRT data source filtered by geometry as we don't know which
   // attributes make up the geometry and OGR won't fetch them to evaluate the
   // filter if we choose to ignore them (fixes #11223)
-  if ( mSource->mDriverName != "OGR_VRT" || mRequest.filterType() != QgsFeatureRequest::FilterRect )
+  if (( mSource->mDriverName != "VRT" && mSource->mDriverName != "OGR_VRT" ) || mRequest.filterType() != QgsFeatureRequest::FilterRect )
   {
     QgsOgrUtils::setRelevantFields( ogrLayer, mSource->mFields.count(), mFetchGeometry, attrs );
   }

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource* source, bool`
`66`	`66`	`// unless it's a VRT data source filtered by geometry as we don't know which`
`67`	`67`	`// attributes make up the geometry and OGR won't fetch them to evaluate the`
`68`	`68`	`// filter if we choose to ignore them (fixes #11223)`
`69`		`- if ( mSource->mDriverName != "OGR_VRT" \|\| mRequest.filterType() != QgsFeatureRequest::FilterRect )`
	`69`	`+ if (( mSource->mDriverName != "VRT" && mSource->mDriverName != "OGR_VRT" ) \|\| mRequest.filterType() != QgsFeatureRequest::FilterRect )`
`70`	`70`	`{`
`71`	`71`	`QgsOgrUtils::setRelevantFields( ogrLayer, mSource->mFields.count(), mFetchGeometry, attrs );`
`72`	`72`	`}`