fix QgsSpatiaLiteProvider::uniqueValues, when there is a subset string

qgis · Mar 22, 2012 · 51ece3c · 51ece3c
1 parent 587b338
commit 51ece3c
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp
@@ -3508,13 +3508,15 @@ void QgsSpatiaLiteProvider::uniqueValues( int index, QList < QVariant > &uniqueV
   }
   const QgsField& fld = fieldIt.value();
 
-  sql = QString( "SELECT DISTINCT %1 FROM %2 ORDER BY %1" ).arg( quotedIdentifier( fld.name() ) ).arg( mQuery );
+  sql = QString( "SELECT DISTINCT %1 FROM %2" ).arg( quotedIdentifier( fld.name() ) ).arg( mQuery );
 
   if ( !mSubsetString.isEmpty() )
   {
     sql += " WHERE ( " + mSubsetString + ")";
   }
 
+  sql += QString( " ORDER BY %1" ).arg( quotedIdentifier( fld.name() ) );
+
   if ( limit >= 0 )
   {
     sql += QString( " LIMIT %1" ).arg( limit );