remove WHERE from Filter::where and append where they're actually used in Get*ByWhere()

6 files changed, 57 insertions, 57 deletions

diff --git a/xbmc/PartyModeManager.cpp b/xbmc/PartyModeManager.cpp
index ecfaf78b98..86d51fb86c 100644
--- a/xbmc/PartyModeManager.cpp
+++ b/xbmc/PartyModeManager.cpp
@@ -587,7 +587,7 @@ bool CPartyModeManager::AddInitialSongs(vector<pair<int,int> > &songIDs)
     vector<pair<int,int> > chosenSongIDs;
     GetRandomSelection(songIDs, iMissingSongs, chosenSongIDs);
     CStdString sqlWhereMusic = "where songview.idSong in (";
-    CStdString sqlWhereVideo = "where idMVideo in (";
+    CStdString sqlWhereVideo = "idMVideo in (";
 
     for (vector< pair<int,int> >::iterator it = chosenSongIDs.begin(); it != chosenSongIDs.end(); it++)
     {
@@ -640,7 +640,7 @@ pair<CStdString,CStdString> CPartyModeManager::GetWhereClauseWithHistory() const
     else
       historyWhereMusic = m_strCurrentFilterMusic + " and songview.idSong not in (";
     if (m_strCurrentFilterVideo.IsEmpty())
-      historyWhereVideo = "where idMVideo not in (";
+      historyWhereVideo = "idMVideo not in (";
     else
       historyWhereVideo = m_strCurrentFilterVideo + " and idMVideo not in (";
 
diff --git a/xbmc/filesystem/SmartPlaylistDirectory.cpp b/xbmc/filesystem/SmartPlaylistDirectory.cpp
index 8cfd7cf7b1..2e0e0503d7 100644
--- a/xbmc/filesystem/SmartPlaylistDirectory.cpp
+++ b/xbmc/filesystem/SmartPlaylistDirectory.cpp
@@ -89,7 +89,7 @@ namespace XFILE
     {
       CMusicDatabase db;
       db.Open();
-      success = db.GetAlbumsByWhere("musicdb://3/", playlist.GetWhereClause(db, playlists), playlist.GetOrderClause(db), items);
+      success = db.GetAlbumsByWhere("musicdb://3/", "WHERE " + playlist.GetWhereClause(db, playlists), playlist.GetOrderClause(db), items);
       items.SetContent("albums");
       db.Close();
     }
@@ -102,10 +102,10 @@ namespace XFILE
       {
         CSmartPlaylist songPlaylist(playlist);
         songPlaylist.SetType("songs");
-        whereOrder = songPlaylist.GetWhereClause(db, playlists) + " " + songPlaylist.GetOrderClause(db);
+        whereOrder = "WHERE " + songPlaylist.GetWhereClause(db, playlists) + " " + songPlaylist.GetOrderClause(db);
       }
       else
-        whereOrder = playlist.GetWhereClause(db, playlists) + " " + playlist.GetOrderClause(db);
+        whereOrder = "WHERE " + playlist.GetWhereClause(db, playlists) + " " + playlist.GetOrderClause(db);
 
       success = db.GetSongsByWhere("", whereOrder, items);
       items.SetContent("songs");
diff --git a/xbmc/interfaces/http-api/XBMChttp.cpp b/xbmc/interfaces/http-api/XBMChttp.cpp
index 7201ac6e13..fa509fd7a4 100644
--- a/xbmc/interfaces/http-api/XBMChttp.cpp
+++ b/xbmc/interfaces/http-api/XBMChttp.cpp
@@ -1025,7 +1025,7 @@ int CXbmcHttp::xbmcAddToPlayListFromDB(int numParas, CStdString paras[])
   // Perform open query if empty where clause
   if (paras[1] == "")
     paras[1] = "1 = 1";
-  CStdString where = "where " + paras[1];
+  CStdString where = paras[1];
 
   int playList;
   CFileItemList filelist;
diff --git a/xbmc/playlists/SmartPlayList.cpp b/xbmc/playlists/SmartPlayList.cpp
index 0b2c0c2c13..b9090e973e 100644
--- a/xbmc/playlists/SmartPlayList.cpp
+++ b/xbmc/playlists/SmartPlayList.cpp
@@ -929,15 +929,13 @@ void CSmartPlaylist::AddRule(const CSmartPlaylistRule &rule)
   m_playlistRules.push_back(rule);
 }
 
-CStdString CSmartPlaylist::GetWhereClause(CDatabase &db, set<CStdString> &referencedPlaylists, bool needWhere /* = true */) const
+CStdString CSmartPlaylist::GetWhereClause(CDatabase &db, set<CStdString> &referencedPlaylists) const
 {
   CStdString rule, currentRule;
   for (vector<CSmartPlaylistRule>::const_iterator it = m_playlistRules.begin(); it != m_playlistRules.end(); ++it)
   {
     if (it != m_playlistRules.begin())
       rule += m_matchAllRules ? " AND " : " OR ";
-    else if (needWhere)
-      rule += "WHERE ";
     rule += "(";
     CStdString currentRule;
     if (it->m_field == CSmartPlaylistRule::FIELD_PLAYLIST)
@@ -953,7 +951,7 @@ CStdString CSmartPlaylist::GetWhereClause(CDatabase &db, set<CStdString> &refere
         if (playlist.GetType().Equals(GetType()) || (playlist.GetType().Equals("mixed") && (GetType() == "songs" || GetType() == "musicvideos")) || playlist.GetType().IsEmpty())
         {
           playlist.SetType(GetType());
-          playlistQuery = playlist.GetWhereClause(db, referencedPlaylists, false);
+          playlistQuery = playlist.GetWhereClause(db, referencedPlaylists);
         }
         if (playlist.GetType().Equals(GetType()))
         {
diff --git a/xbmc/playlists/SmartPlayList.h b/xbmc/playlists/SmartPlayList.h
index 9eaa28a92e..407aceb902 100644
--- a/xbmc/playlists/SmartPlayList.h
+++ b/xbmc/playlists/SmartPlayList.h
@@ -178,7 +178,7 @@ public:
    \param referencedPlaylists a set of playlists to know when we reach a cycle
    \param needWhere whether we need to prepend the where clause with "WHERE "
    */
-  CStdString GetWhereClause(CDatabase &db, std::set<CStdString> &referencedPlaylists, bool needWhere = true) const;
+  CStdString GetWhereClause(CDatabase &db, std::set<CStdString> &referencedPlaylists) const;
   CStdString GetOrderClause(CDatabase &db) const;
 
   const std::vector<CSmartPlaylistRule> &GetRules() const;
diff --git a/xbmc/video/VideoDatabase.cpp b/xbmc/video/VideoDatabase.cpp
index 86f9ff51f6..8caf16c930 100644
--- a/xbmc/video/VideoDatabase.cpp
+++ b/xbmc/video/VideoDatabase.cpp
@@ -1553,7 +1553,7 @@ void CVideoDatabase::GetMoviesByActor(const CStdString& strActor, CFileItemList&
                             "LEFT JOIN actors a ON a.idActor=actorlinkmovie.idActor "
                             "LEFT JOIN directorlinkmovie ON directorlinkmovie.idMovie=movieview.idMovie "
                             "LEFT JOIN actors d ON d.idActor=directorlinkmovie.idDirector");
-  filter.where = PrepareSQL("WHERE a.strActor='%s' OR d.strActor='%s' GROUP BY movieview.idMovie", strActor.c_str(), strActor.c_str());
+  filter.where = PrepareSQL("a.strActor='%s' OR d.strActor='%s' GROUP BY movieview.idMovie", strActor.c_str(), strActor.c_str());
   GetMoviesByWhere("videodb://1/2/", filter, items);
 }
 
@@ -1564,7 +1564,7 @@ void CVideoDatabase::GetTvShowsByActor(const CStdString& strActor, CFileItemList
                             "LEFT JOIN actors a ON a.idActor=actorlinktvshow.idActor "
                             "LEFT JOIN directorlinktvshow ON directorlinktvshow.idShow=tvshowview.idShow "
                             "LEFT JOIN actors d ON d.idActor=directorlinktvshow.idDirector");
-  filter.where = PrepareSQL("WHERE a.strActor='%s' OR d.strActor='%s' GROUP BY tvshowview.idShow", strActor.c_str(), strActor.c_str());
+  filter.where = PrepareSQL("a.strActor='%s' OR d.strActor='%s' GROUP BY tvshowview.idShow", strActor.c_str(), strActor.c_str());
   GetTvShowsByWhere("videodb://2/2/", filter, items);
 }
 
@@ -1575,7 +1575,7 @@ void CVideoDatabase::GetEpisodesByActor(const CStdString& strActor, CFileItemLis
                             "LEFT JOIN actors a ON a.idActor=actorlinkepisode.idActor "
                             "LEFT JOIN directorlinkepisode ON directorlinkepisode.idEpisode=episodeview.idEpisode "
                             "LEFT JOIN actors d ON d.idActor=directorlinkepisode.idDirector");
-  filter.where = PrepareSQL("WHERE a.strActor='%s' OR d.strActor='%s' GROUP BY episodeview.idEpisode", strActor.c_str(), strActor.c_str());
+  filter.where = PrepareSQL("a.strActor='%s' OR d.strActor='%s' GROUP BY episodeview.idEpisode", strActor.c_str(), strActor.c_str());
   GetEpisodesByWhere("videodb://2/2/", filter, items);
 }
 
@@ -1706,7 +1706,7 @@ bool CVideoDatabase::GetSetInfo(int idSet, CVideoInfoTag& details)
     if (idSet < 0)
       return false;
 
-    CStdString where = PrepareSQL("WHERE sets.idSet=%d", idSet);
+    CStdString where = PrepareSQL("sets.idSet=%d", idSet);
     CFileItemList items;
     if (!GetSetsNav("videodb://1/7/", items, VIDEODB_CONTENT_MOVIES, where) ||
         items.Size() != 1 ||
@@ -4229,7 +4229,8 @@ bool CVideoDatabase::GetSetsNav(const CStdString& strBaseDir, CFileItemList& ite
     {
       if (idContent == VIDEODB_CONTENT_MOVIES)
         strSQL=PrepareSQL("SELECT sets.idSet,sets.strSet,path.strPath,files.playCount FROM sets JOIN setlinkmovie ON sets.idSet=setlinkmovie.idSet JOIN (SELECT idSet, COUNT(1) AS c FROM setlinkmovie GROUP BY idSet HAVING c>1) s2 ON s2.idSet=sets.idSet JOIN movie ON setlinkmovie.idMovie=movie.idMovie JOIN files ON files.idFile=movie.idFile JOIN path ON path.idPath=files.idPath ");
-      strSQL += where;
+      if (!where.empty())
+        strSQL += " WHERE " + where;
     }
     else
     {
@@ -4239,7 +4240,8 @@ bool CVideoDatabase::GetSetsNav(const CStdString& strBaseDir, CFileItemList& ite
         strSQL=PrepareSQL("SELECT sets.idSet,sets.strSet,COUNT(1) AS c,count(files.playCount) FROM sets JOIN setlinkmovie ON sets.idSet=setlinkmovie.idSet JOIN movie ON setlinkmovie.idMovie=movie.idMovie JOIN files ON files.idFile=movie.idFile ");
         group = " GROUP BY sets.idSet HAVING c>1";
       }
-      strSQL += where;
+      if (!where.empty())
+        strSQL += " WHERE " + where;
       strSQL += group;
     }
 
@@ -4952,7 +4954,7 @@ bool CVideoDatabase::GetSeasonsNav(const CStdString& strBaseDir, CFileItemList&
     // now add any linked movies
     Filter filter;
     filter.join  = PrepareSQL("join movielinktvshow on movielinktvshow.idMovie=movieview.idMovie");
-    filter.where = PrepareSQL("WHERE movielinktvshow.idShow %s", strIn.c_str());
+    filter.where = PrepareSQL("movielinktvshow.idShow %s", strIn.c_str());
     GetMoviesByWhere("videodb://1/2/", filter, items);
     return true;
   }
@@ -4969,34 +4971,34 @@ bool CVideoDatabase::GetMoviesNav(const CStdString& strBaseDir, CFileItemList& i
   if (idGenre != -1)
   {
     filter.join  = PrepareSQL("join genrelinkmovie on genrelinkmovie.idMovie=movieview.idMovie");
-    filter.where = PrepareSQL("where genrelinkmovie.idGenre=%i", idGenre);
+    filter.where = PrepareSQL("genrelinkmovie.idGenre=%i", idGenre);
   }
   else if (idCountry != -1)
   {
     filter.join  = PrepareSQL("join countrylinkmovie on countrylinkmovie.idMovie=movieview.idMovie");
-    filter.where = PrepareSQL("where countrylinkmovie.idCountry=%i", idCountry);
+    filter.where = PrepareSQL("countrylinkmovie.idCountry=%i", idCountry);
   }
   else if (idStudio != -1)
   {
     filter.join  = PrepareSQL("join studiolinkmovie on studiolinkmovie.idMovie=movieview.idMovie");
-    filter.where = PrepareSQL("where studiolinkmovie.idStudio=%i", idStudio);
+    filter.where = PrepareSQL("studiolinkmovie.idStudio=%i", idStudio);
   }
   else if (idDirector != -1)
   {
     filter.join  = PrepareSQL("join directorlinkmovie on directorlinkmovie.idMovie=movieview.idMovie");
-    filter.where = PrepareSQL("where directorlinkmovie.idDirector=%i", idDirector);
+    filter.where = PrepareSQL("directorlinkmovie.idDirector=%i", idDirector);
   }
   else if (idYear !=-1)
-    filter.where = PrepareSQL("where c%02d='%i'",VIDEODB_ID_YEAR,idYear);
+    filter.where = PrepareSQL("c%02d='%i'",VIDEODB_ID_YEAR,idYear);
   else if (idActor != -1)
   {
     filter.join  = PrepareSQL("join actorlinkmovie on actorlinkmovie.idMovie=movieview.idMovie join actors on actors.idActor=actorlinkmovie.idActor");
-    filter.where = PrepareSQL("where actors.idActor=%i",idActor);
+    filter.where = PrepareSQL("actors.idActor=%i",idActor);
   }
   else if (idSet != -1)
   {
     filter.join  = PrepareSQL("join setlinkmovie on setlinkmovie.idMovie=movieview.idMovie");
-    filter.where = PrepareSQL("where setlinkmovie.idSet=%u",idSet);
+    filter.where = PrepareSQL("setlinkmovie.idSet=%u",idSet);
   }
 
   return GetMoviesByWhere(strBaseDir, filter, items, idSet == -1);
@@ -5019,11 +5021,11 @@ bool CVideoDatabase::GetMoviesByWhere(const CStdString& strBaseDir, const Filter
       CStdString setsWhere;
       if (!filter.where.empty() || !filter.join.empty())
       {
-        setsWhere = "where movie.idMovie in (select movieview.idMovie from movieview ";
+        setsWhere = "movie.idMovie in (select movieview.idMovie from movieview ";
         if (!filter.join.empty())
           setsWhere += filter.join;
         if (!filter.where.empty())
-          setsWhere += " " + filter.where;
+          setsWhere += " WHERE " + filter.where;
         setsWhere += ")";
       }
       GetSetsNav("videodb://1/7/", items, VIDEODB_CONTENT_MOVIES, setsWhere);
@@ -5032,7 +5034,7 @@ bool CVideoDatabase::GetMoviesByWhere(const CStdString& strBaseDir, const Filter
         strSQL += filter.join;
       if (!filter.where.empty())
       {
-        strSQL += " " + filter.where;
+        strSQL += " WHERE " + filter.where;
         strSQL += PrepareSQL(" AND " + movieSetsWhere);
       }
       else
@@ -5043,7 +5045,7 @@ bool CVideoDatabase::GetMoviesByWhere(const CStdString& strBaseDir, const Filter
       if (!filter.join.empty())
         strSQL += filter.join;
       if (!filter.where.empty())
-        strSQL += " " + filter.where;
+        strSQL += " WHERE " + filter.where;
     }
 
     if (filter.order.size())
@@ -5088,24 +5090,24 @@ bool CVideoDatabase::GetTvShowsNav(const CStdString& strBaseDir, CFileItemList&
   if (idGenre != -1)
   {
     filter.join  = PrepareSQL("join genrelinktvshow on genrelinktvshow.idShow=tvshowview.idShow");
-    filter.where = PrepareSQL("where genrelinktvshow.idGenre=%i ", idGenre);
+    filter.where = PrepareSQL("genrelinktvshow.idGenre=%i ", idGenre);
   }
   else if (idStudio != -1)
   {
     filter.join  = PrepareSQL("join studiolinktvshow on studiolinktvshow.idShow=tvshowview.idShow");
-    filter.where = PrepareSQL("where studiolinktvshow.idStudio=%i", idStudio);
+    filter.where = PrepareSQL("studiolinktvshow.idStudio=%i", idStudio);
   }
   else if (idDirector != -1)
   {
     filter.join  = PrepareSQL("join directorlinktvshow on directorlinktvshow.idShow=tvshowview.idShow");
-    filter.where = PrepareSQL("where directorlinktvshow.idDirector=%i", idDirector);
+    filter.where = PrepareSQL("directorlinktvshow.idDirector=%i", idDirector);
   }
   else if (idYear != -1)
-    filter.where = PrepareSQL("where c%02d like '%%%i%%'", VIDEODB_ID_TV_PREMIERED,idYear);
+    filter.where = PrepareSQL("c%02d like '%%%i%%'", VIDEODB_ID_TV_PREMIERED,idYear);
   else if (idActor != -1)
   {
     filter.join  = PrepareSQL("join actorlinktvshow on actorlinktvshow.idShow=tvshowview.idShow join actors on actors.idActor=actorlinktvshow.idActor");
-    filter.where = PrepareSQL("where actors.idActor=%i",idActor);
+    filter.where = PrepareSQL("actors.idActor=%i",idActor);
   }
 
   return GetTvShowsByWhere(strBaseDir, filter, items);
@@ -5124,7 +5126,7 @@ bool CVideoDatabase::GetTvShowsByWhere(const CStdString& strBaseDir, const Filte
     if (!filter.join.empty())
       strSQL += filter.join;
     if (!filter.where.empty())
-      strSQL += " " + filter.where;
+      strSQL += " WHERE " + filter.where;
     if (!filter.order.empty())
       strSQL += " " + filter.order;
     int iRowsFound = RunQuery(strSQL);
@@ -5363,24 +5365,24 @@ bool CVideoDatabase::GetEpisodesNav(const CStdString& strBaseDir, CFileItemList&
     if (idGenre != -1)
     {
       filter.join  = PrepareSQL("join genrelinktvshow on genrelinktvshow.idShow=episodeview.idShow");
-      filter.where = PrepareSQL("where episodeview.idShow=%i and genrelinktvshow.idGenre=%i",idShow,idGenre);
+      filter.where = PrepareSQL("episodeview.idShow=%i and genrelinktvshow.idGenre=%i",idShow,idGenre);
     }
     else if (idDirector != -1)
     {
       filter.join  = PrepareSQL("join directorlinktvshow on directorlinktvshow.idShow=episodeview.idShow");
-      filter.where = PrepareSQL("where episodeview.idShow=%i and directorlinktvshow.idDirector=%i",idShow,idDirector);
+      filter.where = PrepareSQL("episodeview.idShow=%i and directorlinktvshow.idDirector=%i",idShow,idDirector);
     }
     else if (idYear !=-1)
     {
-      filter.where = PrepareSQL("where idShow=%i and premiered like '%%%i%%'", idShow, idYear);
+      filter.where = PrepareSQL("idShow=%i and premiered like '%%%i%%'", idShow, idYear);
     }
     else if (idActor != -1)
     {
       filter.join  = PrepareSQL("join actorlinktvshow on actorlinktvshow.idShow=episodeview.idShow");
-      filter.where = PrepareSQL("where episodeview.idShow=%i and actorlinktvshow.idActor=%i",idShow,idActor);
+      filter.where = PrepareSQL("episodeview.idShow=%i and actorlinktvshow.idActor=%i",idShow,idActor);
     }
     else
-      filter.where = PrepareSQL("where idShow %s",strIn.c_str());
+      filter.where = PrepareSQL("idShow %s",strIn.c_str());
 
     if (idSeason != -1)
     {
@@ -5391,7 +5393,7 @@ bool CVideoDatabase::GetEpisodesNav(const CStdString& strBaseDir, CFileItemList&
     }
   }
   else if (idYear !=-1)
-    filter.where = PrepareSQL("where premiered like '%%%i%%'", idYear);
+    filter.where = PrepareSQL("premiered like '%%%i%%'", idYear);
 
   // we always append show, season + episode in GetEpisodesByWhere
   CStdString parent, grandParent;
@@ -5404,7 +5406,7 @@ bool CVideoDatabase::GetEpisodesNav(const CStdString& strBaseDir, CFileItemList&
   { // add any linked movies
     Filter filter;
     filter.join  = PrepareSQL("join movielinktvshow on movielinktvshow.idMovie=movieview.idMovie");
-    filter.where = PrepareSQL("where movielinktvshow.idShow %s", strIn.c_str());
+    filter.where = PrepareSQL("movielinktvshow.idShow %s", strIn.c_str());
     GetMoviesByWhere("videodb://1/2/", filter, items);
   }
   return ret;
@@ -5424,7 +5426,7 @@ bool CVideoDatabase::GetEpisodesByWhere(const CStdString& strBaseDir, const Filt
     if (!filter.join.empty())
       strSQL += filter.join;
     if (!filter.where.empty())
-      strSQL += " " + filter.where;
+      strSQL += " WHERE " + filter.where;
     if (!filter.order.empty())
       strSQL += " " + filter.order;
     int iRowsFound = RunQuery(strSQL);
@@ -5478,30 +5480,30 @@ bool CVideoDatabase::GetMusicVideosNav(const CStdString& strBaseDir, CFileItemLi
   if (idGenre != -1)
   {
     filter.join  = PrepareSQL("join genrelinkmusicvideo on genrelinkmusicvideo.idMVideo=musicvideoview.idMVideo");
-    filter.where = PrepareSQL("where genrelinkmusicvideo.idGenre=%i", idGenre);
+    filter.where = PrepareSQL("genrelinkmusicvideo.idGenre=%i", idGenre);
   }
   else if (idStudio != -1)
   {
     filter.join  = PrepareSQL("join studiolinkmusicvideo on studiolinkmusicvideo.idMVideo=musicvideoview.idMVideo");
-    filter.where = PrepareSQL("where studiolinkmusicvideo.idStudio=%i", idStudio);
+    filter.where = PrepareSQL("studiolinkmusicvideo.idStudio=%i", idStudio);
   }
   else if (idDirector != -1)
   {
     filter.join  = PrepareSQL("join directorlinkmusicvideo on directorlinkmusicvideo.idMVideo=musicvideoview.idMVideo");
-    filter.where = PrepareSQL("where directorlinkmusicvideo.idDirector=%i", idDirector);
+    filter.where = PrepareSQL("directorlinkmusicvideo.idDirector=%i", idDirector);
   }
   else if (idYear !=-1)
-    filter.where = PrepareSQL("where c%02d='%i'",VIDEODB_ID_MUSICVIDEO_YEAR,idYear);
+    filter.where = PrepareSQL("c%02d='%i'",VIDEODB_ID_MUSICVIDEO_YEAR,idYear);
   else if (idArtist != -1)
   {
     filter.join  = PrepareSQL("join artistlinkmusicvideo on artistlinkmusicvideo.idMVideo=musicvideoview.idMVideo join actors on actors.idActor=artistlinkmusicvideo.idArtist");
-    filter.where = PrepareSQL("where actors.idActor=%i",idArtist);
+    filter.where = PrepareSQL("actors.idActor=%i",idArtist);
   }
   if (idAlbum != -1)
    {
     CStdString str2 = PrepareSQL("musicvideoview.c%02d=(select c%02d from musicvideo where idMVideo=%i)",VIDEODB_ID_MUSICVIDEO_ALBUM,VIDEODB_ID_MUSICVIDEO_ALBUM,idAlbum);
     if (filter.where.empty())
-      filter.where = "where " + str2;
+      filter.where = str2;
     else
       filter.where += " and " + str2;
   }
@@ -6253,7 +6255,7 @@ bool CVideoDatabase::GetMusicVideosByWhere(const CStdString &baseDir, const Filt
     if (!filter.join.empty())
       strSQL += filter.join;
     if (!filter.where.empty())
-      strSQL += " " + filter.where;
+      strSQL += " WHERE " + filter.where;
     if (!filter.order.empty())
       strSQL += " " + filter.order;
     CLog::Log(LOGDEBUG, "%s query = %s", __FUNCTION__, strSQL.c_str());
@@ -6552,7 +6554,7 @@ void CVideoDatabase::GetMusicVideosByName(const CStdString& strSearch, CFileItem
 {
 // Alternative searching - not quite as fast though due to
 // retrieving all information
-//  Filter filter(PrepareSQL("where c%02d like '%s%%' or c%02d like '%% %s%%'", VIDEODB_ID_MUSICVIDEO_TITLE, strSearch.c_str(), VIDEODB_ID_MUSICVIDEO_TITLE, strSearch.c_str()));
+//  Filter filter(PrepareSQL("c%02d like '%s%%' or c%02d like '%% %s%%'", VIDEODB_ID_MUSICVIDEO_TITLE, strSearch.c_str(), VIDEODB_ID_MUSICVIDEO_TITLE, strSearch.c_str()));
 //  GetMusicVideosByWhere("videodb://3/2/", filter, items);
   CStdString strSQL;
 
@@ -6598,7 +6600,7 @@ void CVideoDatabase::GetEpisodesByPlot(const CStdString& strSearch, CFileItemLis
 // Alternative searching - not quite as fast though due to
 // retrieving all information
 //  Filter filter;
-//  filter.where = PrepareSQL("where c%02d like '%s%%' or c%02d like '%% %s%%'", VIDEODB_ID_EPISODE_PLOT, strSearch.c_str(), VIDEODB_ID_EPISODE_PLOT, strSearch.c_str());
+//  filter.where = PrepareSQL("c%02d like '%s%%' or c%02d like '%% %s%%'", VIDEODB_ID_EPISODE_PLOT, strSearch.c_str(), VIDEODB_ID_EPISODE_PLOT, strSearch.c_str());
 //  filter.where += PrepareSQL("or c%02d like '%s%%' or c%02d like '%% %s%%'", VIDEODB_ID_EPISODE_TITLE, strSearch.c_str(), VIDEODB_ID_EPISODE_TITLE, strSearch.c_str());
 //  GetEpisodesByWhere("videodb://2/2/", filter, items);
 //  return;
@@ -7229,7 +7231,7 @@ void CVideoDatabase::DumpToDummyFiles(const CStdString &path)
     if (CDirectory::Create(TVFolder))
     { // right - grab the episodes and dump them as well
       CFileItemList episodes;
-      Filter filter(PrepareSQL("where idShow=%i", items[i]->GetVideoInfoTag()->m_iDbId));
+      Filter filter(PrepareSQL("idShow=%i", items[i]->GetVideoInfoTag()->m_iDbId));
       GetEpisodesByWhere("videodb://2/2/", filter, episodes);
       for (int i = 0; i < episodes.Size(); i++)
       {
@@ -8198,22 +8200,22 @@ bool CVideoDatabase::GetItemsForPath(const CStdString &content, const CStdString
 
   if (content == "movies")
   {
-    Filter filter(PrepareSQL("where c%02d=%d", VIDEODB_ID_PARENTPATHID, pathID));
+    Filter filter(PrepareSQL("c%02d=%d", VIDEODB_ID_PARENTPATHID, pathID));
     GetMoviesByWhere("", filter, items);
   }
   else if (content == "episodes")
   {
-    Filter filter(PrepareSQL("where c%02d=%d", VIDEODB_ID_EPISODE_PARENTPATHID, pathID));
+    Filter filter(PrepareSQL("c%02d=%d", VIDEODB_ID_EPISODE_PARENTPATHID, pathID));
     GetEpisodesByWhere("", filter, items);
   }
   else if (content == "tvshows")
   {
-    Filter filter(PrepareSQL("where c%02d=%d", VIDEODB_ID_TV_PARENTPATHID, pathID));
+    Filter filter(PrepareSQL("c%02d=%d", VIDEODB_ID_TV_PARENTPATHID, pathID));
     GetTvShowsByWhere("", filter, items);
   }
   else if (content == "musicvideos")
   {
-    Filter filter(PrepareSQL("where c%02d=%d", VIDEODB_ID_MUSICVIDEO_PARENTPATHID, pathID));
+    Filter filter(PrepareSQL("c%02d=%d", VIDEODB_ID_MUSICVIDEO_PARENTPATHID, pathID));
     GetMusicVideosByWhere("", filter, items);
   }
   for (int i = 0; i < items.Size(); i++)