Ticket #2369: music_artist_qualification_fix.diff

playbackbox.cpp

@@ -549 +549 @@
         return;
 
    closePlaylistPopup();
-   updatePlaylistFromQuickPlaylist("ORDER BY artist_name, album_name, track");
+   updatePlaylistFromQuickPlaylist("ORDER BY music_artists.artist_name, album_name, track");
 }
 
 void PlaybackBoxMusic::fromCD()
@@ -605 +605 @@
         return;
 
     QString value = formattedFieldValue(curMeta->Artist().utf8());
-    QString whereClause = "WHERE artist_name = " + value +
+    QString whereClause = "WHERE music_artists.artist_name = " + value +
                           " ORDER BY album_name, track"; 
 
     closePlaylistPopup();
@@ -631 +631 @@
 
     QString value = formattedFieldValue(curMeta->Genre().utf8()); 
     QString whereClause = "WHERE genre = " + value +
-                          " ORDER BY artist_name, album_name, track";   
+                          " ORDER BY music_artists.artist_name, album_name, track";   
     closePlaylistPopup();
     updatePlaylistFromQuickPlaylist(whereClause);
 }
@@ -643 +643 @@
 
     QString value = formattedFieldValue(curMeta->Year()); 
     QString whereClause = "WHERE year = " + value + 
-                          " ORDER BY artist_name, album_name, track";
+                          " ORDER BY music_artists.artist_name, album_name, track";
     closePlaylistPopup();
     updatePlaylistFromQuickPlaylist(whereClause);
 }

search.cpp

@@ -103 +103 @@
 
     MSqlQuery query(MSqlQuery::InitCon());
 
-    QString queryString("SELECT filename, artist_name, album_name, name, song_id "
+    QString queryString("SELECT filename, music_artists.artist_name, album_name, name, song_id "
                         "FROM music_songs "
                         "LEFT JOIN music_artists ON music_songs.artist_id=music_artists.artist_id "
                         "LEFT JOIN music_albums ON music_songs.album_id=music_albums.album_id ");      
@@ -143 +143 @@
     }
 
     queryString += whereClause;
-    queryString += " ORDER BY artist_name, album_name, name, song_id, filename ";
+    queryString += " ORDER BY music_artists.artist_name, album_name, name, song_id, filename ";
 
     query.prepare(queryString);