jdb/wdiwtlt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bugs introduced by trying to use DISCTINCT after ORDER BY.

Browse Source
This commit is contained in:
Jonathan Bernard 2016-03-16 08:20:44 -05:00
parent 8e145b244d
commit 32f99df53e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/groovy/com/jdbernard/wdiwtlt/db/DbApi.groovy
View File

@ -423,7 +423,7 @@ public class DbApi {
def whereClauses = [] def whereClauses = []
def newJoin def newJoin
query.append('SELECT DISTINCT * FROM (SELECT mf.* FROM media_files mf ') query.append('SELECT mf.* FROM media_files mf ')
if (params.artistId || params.playlistId) { if (params.artistId || params.playlistId) {
joins << (newJoin = [ joins << (newJoin = [
@ -501,11 +501,11 @@ public class DbApi {
if (orderClauses) if (orderClauses)
query.append(' ORDER BY ').append(orderClauses.join(', ')) query.append(' ORDER BY ').append(orderClauses.join(', '))
query = query.append(') as filtered_sorted_media_files').toString() query = query.toString()
logger.debug('Selecting media files.\n\tSQL: {}\n\tPARAMS: {}', logger.debug('Selecting media files.\n\tSQL: {}\n\tPARAMS: {}',
query, sqlParams) query, sqlParams)
return sql.rows(query, sqlParams).collect { return sql.rows(query, sqlParams).collect {
recordToModel(MediaFile, it) } } recordToModel(MediaFile, it) }.unique() }
public List<MediaFile> getUntaggedFiles() { public List<MediaFile> getUntaggedFiles() {
String query = """ String query = """