Fix uniqueValues for virtual field

m-kuhn · m-kuhn · commit 302b2ae2553b · 2014-07-24T17:07:33.000+02:00
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2830,7 +2830,7 @@ void QgsVectorLayer::uniqueValues( int index, QList<QVariant> &uniqueValues, int
   else if ( origin == QgsFields::OriginEdit || origin == QgsFields::OriginExpression )
   {
     // the layer is editable, but in certain cases it can still be avoided going through all features
-    if ( mEditBuffer->mDeletedFeatureIds.isEmpty() && mEditBuffer->mAddedFeatures.isEmpty() && !mEditBuffer->mDeletedAttributeIds.contains( index ) && mEditBuffer->mChangedAttributeValues.isEmpty() )
+    if ( origin == QgsFields::OriginEdit && mEditBuffer->mDeletedFeatureIds.isEmpty() && mEditBuffer->mAddedFeatures.isEmpty() && !mEditBuffer->mDeletedAttributeIds.contains( index ) && mEditBuffer->mChangedAttributeValues.isEmpty() )
     {
       return mDataProvider->uniqueValues( index, uniqueValues, limit );
     }

Original file line number	Diff line number	Diff line change
`@@ -2830,7 +2830,7 @@ void QgsVectorLayer::uniqueValues( int index, QList<QVariant> &uniqueValues, int`
`2830`	`2830`	`else if ( origin == QgsFields::OriginEdit \|\| origin == QgsFields::OriginExpression )`
`2831`	`2831`	`{`
`2832`	`2832`	`// the layer is editable, but in certain cases it can still be avoided going through all features`
`2833`		`- if ( mEditBuffer->mDeletedFeatureIds.isEmpty() && mEditBuffer->mAddedFeatures.isEmpty() && !mEditBuffer->mDeletedAttributeIds.contains( index ) && mEditBuffer->mChangedAttributeValues.isEmpty() )`
	`2833`	`+ if ( origin == QgsFields::OriginEdit && mEditBuffer->mDeletedFeatureIds.isEmpty() && mEditBuffer->mAddedFeatures.isEmpty() && !mEditBuffer->mDeletedAttributeIds.contains( index ) && mEditBuffer->mChangedAttributeValues.isEmpty() )`
`2834`	`2834`	`{`
`2835`	`2835`	`return mDataProvider->uniqueValues( index, uniqueValues, limit );`
`2836`	`2836`	`}`