diff --git a/src/libtomahawk/database/DatabaseCommand_LoadAllAutoPlaylists.cpp b/src/libtomahawk/database/DatabaseCommand_LoadAllAutoPlaylists.cpp index d4152198a..2993f3858 100644 --- a/src/libtomahawk/database/DatabaseCommand_LoadAllAutoPlaylists.cpp +++ b/src/libtomahawk/database/DatabaseCommand_LoadAllAutoPlaylists.cpp @@ -51,7 +51,11 @@ DatabaseCommand_LoadAllAutoPlaylists::exec( DatabaseImpl* dbi ) query.exec( QString( "SELECT playlist.guid as guid, title, info, creator, createdOn, lastmodified, shared, currentrevision, dynamic_playlist.pltype, dynamic_playlist.plmode " - "FROM playlist, dynamic_playlist WHERE dynplaylist = 'true' AND playlist.guid = dynamic_playlist.guid AND dynamic_playlist.plmode = %1 AND dynamic_playlist.autoload = 'true' " + "FROM playlist, dynamic_playlist WHERE " + "(dynplaylist = 'true' OR dynplaylist = 1) " + "AND playlist.guid = dynamic_playlist.guid " + "AND dynamic_playlist.plmode = %1 " + "AND (dynamic_playlist.autoload = 'true' OR dynamic_playlist.autoload = 1) " "%2" "%3 %4 %5" ) diff --git a/src/libtomahawk/database/DatabaseCommand_LoadAllStations.cpp b/src/libtomahawk/database/DatabaseCommand_LoadAllStations.cpp index 9146ea14e..335e05076 100644 --- a/src/libtomahawk/database/DatabaseCommand_LoadAllStations.cpp +++ b/src/libtomahawk/database/DatabaseCommand_LoadAllStations.cpp @@ -51,7 +51,10 @@ DatabaseCommand_LoadAllStations::exec( DatabaseImpl* dbi ) query.exec( QString( "SELECT playlist.guid as guid, title, info, creator, createdOn, lastmodified, shared, currentrevision, dynamic_playlist.pltype, dynamic_playlist.plmode " "FROM playlist, dynamic_playlist WHERE " - "dynplaylist = 'true' AND playlist.guid = dynamic_playlist.guid AND dynamic_playlist.plmode = %1 AND dynamic_playlist.autoload = 'true' " + "(dynplaylist = 'true' OR dynplaylist = 1) " + "AND playlist.guid = dynamic_playlist.guid " + "AND dynamic_playlist.plmode = %1 " + "AND (dynamic_playlist.autoload = 'true' OR dynamic_playlist.autoload = 1) " "%2" "%3 %4 %5" ) diff --git a/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylist.cpp b/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylist.cpp index c47754fb1..a3e10f4c4 100644 --- a/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylist.cpp +++ b/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylist.cpp @@ -44,7 +44,11 @@ Tomahawk::DatabaseCommand_LoadDynamicPlaylist::exec( DatabaseImpl* dbi ) TomahawkSqlQuery query = dbi->newquery(); query.exec( QString( "SELECT playlist.guid as guid, title, info, creator, createdOn, lastmodified, shared, currentrevision, dynamic_playlist.pltype, dynamic_playlist.plmode " - "FROM playlist, dynamic_playlist WHERE source %1 AND dynplaylist = 'true' AND playlist.guid = dynamic_playlist.guid AND playlist.guid = '%2'" ) + "FROM playlist, dynamic_playlist WHERE " + "source %1 " + "AND (dynplaylist = 'true' OR dynplaylist = 1)" + "AND playlist.guid = dynamic_playlist.guid " + "AND playlist.guid = '%2'" ) .arg( source()->isLocal() ? "IS NULL" : QString( "=%1" ).arg( source()->id() ) ).arg( m_plid ) ); QList plists;