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

jef-n · jef-n · commit 51ece3c0c4be · 2012-03-22T22:41:27.000+01:00
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 );

Original file line number	Diff line number	Diff line change
`@@ -3508,13 +3508,15 @@ void QgsSpatiaLiteProvider::uniqueValues( int index, QList < QVariant > &uniqueV`
`3508`	`3508`	`}`
`3509`	`3509`	`const QgsField& fld = fieldIt.value();`
`3510`	`3510`
`3511`		`- sql = QString( "SELECT DISTINCT %1 FROM %2 ORDER BY %1" ).arg( quotedIdentifier( fld.name() ) ).arg( mQuery );`
	`3511`	`+ sql = QString( "SELECT DISTINCT %1 FROM %2" ).arg( quotedIdentifier( fld.name() ) ).arg( mQuery );`
`3512`	`3512`
`3513`	`3513`	`if ( !mSubsetString.isEmpty() )`
`3514`	`3514`	`{`
`3515`	`3515`	`sql += " WHERE ( " + mSubsetString + ")";`
`3516`	`3516`	`}`
`3517`	`3517`
	`3518`	`+ sql += QString( " ORDER BY %1" ).arg( quotedIdentifier( fld.name() ) );`
	`3519`	`+`
`3518`	`3520`	`if ( limit >= 0 )`
`3519`	`3521`	`{`
`3520`	`3522`	`sql += QString( " LIMIT %1" ).arg( limit );`