From c40b505fba5d51ccb2ffd1fd6cca38923ba09faa Mon Sep 17 00:00:00 2001 From: APTX Date: Tue, 24 Jul 2012 01:27:32 +0200 Subject: [PATCH] Some more fixes related to schema changes --- localmylist/database.cpp | 43 +++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/localmylist/database.cpp b/localmylist/database.cpp index e0c1bbc..516f23b 100644 --- a/localmylist/database.cpp +++ b/localmylist/database.cpp @@ -40,6 +40,7 @@ Episode::Episode() epno = 0; length = 0; state = 0; + type = ""; recap = false; rating = 0; votes = 0; @@ -446,7 +447,7 @@ Anime Database::getAnime(int aid) QSqlQuery &q = prepare( "SELECT aid, entry_added, anidb_update, entry_update, my_update, title_english, " " title_romaji, title_kanji, description, year, start_date, end_date, " - " type, rating, votes, temp_rating, temp_votes, my_vote, my_vote_date, " + " type, total_episode_count, highest_epno, rating, votes, temp_rating, temp_votes, my_vote, my_vote_date, " " my_temp_vote, my_temp_vote_date " " FROM anime " " WHERE aid = :aid "); @@ -475,14 +476,16 @@ Anime Database::getAnime(int aid) a.startDate = q.value(10).toDateTime(); a.endDate = q.value(11).toDateTime(); a.type = q.value(12).toString(); - a.rating = q.value(13).toDouble(); - a.votes = q.value(14).toInt(); - a.tempRating = q.value(15).toDouble(); - a.tempVotes = q.value(16).toInt(); - a.myVote = q.value(17).toDouble(); - a.myVoteDate = q.value(18).toDateTime(); - a.myTempVote = q.value(19).toDouble(); - a.myTempVoteDate = q.value(20).toDateTime(); + a.totalEpisodeCount = q.value(13).toInt(); + a.highestEpno = q.value(14).toInt(); + a.rating = q.value(15).toDouble(); + a.votes = q.value(16).toInt(); + a.tempRating = q.value(17).toDouble(); + a.tempVotes = q.value(18).toInt(); + a.myVote = q.value(19).toDouble(); + a.myVoteDate = q.value(20).toDateTime(); + a.myTempVote = q.value(21).toDouble(); + a.myTempVoteDate = q.value(22).toDateTime(); q.finish(); @@ -545,9 +548,9 @@ File Database::getFile(int fid) File f; QSqlQuery &q = prepare( - "SELECT fid, eid, aid, gid, anidb_update, entry_update, my_update, " + "SELECT fid, eid, aid, gid, entry_added, anidb_update, entry_update, my_update, " " ed2k, size, length, extension, group_name, group_name_short, crc, " - " release_date, version, censored, type, quality_id, quality, resolution, " + " release_date, version, censored, source, quality_id, quality, resolution, " " video_codec, audio_codec, audio_language, subtitle_language, aspect_ratio, " " my_watched, my_state, my_file_state, my_storage, my_source, my_other " " FROM file " @@ -573,7 +576,7 @@ File Database::getFileByPath(const QString &path) QSqlQuery &q = prepare( "SELECT f.fid, f.eid, f.aid, f.gid, f.entry_added, f.anidb_update, f.entry_update, f.my_update, " " f.ed2k, f.size, f.length, f.extension, f.group_name, f.group_name_short, f.crc, " - " f.release_date, f.version, f.censored, f.type, f.quality_id, f.quality, f.resolution, " + " f.release_date, f.version, f.censored, f.source, f.quality_id, f.quality, f.resolution, " " f.video_codec, f.audio_codec, f.audio_language, f.subtitle_language, f.aspect_ratio, " " f.my_watched, f.my_state, f.my_file_state, f.my_storage, f.my_source, f.my_other " " FROM file f " @@ -599,7 +602,7 @@ File Database::getFileByTitle(const QString &title, int epno) QSqlQuery &q = prepare( "SELECT f.fid, f.eid, f.aid, f.gid, f.entry_added, f.anidb_update, f.entry_update, f.my_update, " " f.ed2k, f.size, f.length, f.extension, f.group_name, f.group_name_short, f.crc, " - " f.release_date, f.version, f.censored, f.type, f.quality_id, f.quality, f.resolution, " + " f.release_date, f.version, f.censored, f.source, f.quality_id, f.quality, f.resolution, " " f.video_codec, f.audio_codec, f.audio_language, f.subtitle_language, f.aspect_ratio, " " f.my_watched, f.my_state, f.my_file_state, f.my_storage, f.my_source, f.my_other " " FROM file f " @@ -610,7 +613,7 @@ File Database::getFileByTitle(const QString &title, int epno) "UNION " "SELECT f.fid, f.eid, f.aid, f.gid, f.entry_added, f.anidb_update, f.entry_update, f.my_update, " " f.ed2k, f.size, f.length, f.extension, f.group_name, f.group_name_short, f.crc, " - " f.release_date, f.version, f.censored, f.type, f.quality_id, f.quality, f.resolution, " + " f.release_date, f.version, f.censored, f.source, f.quality_id, f.quality, f.resolution, " " f.video_codec, f.audio_codec, f.audio_language, f.subtitle_language, f.aspect_ratio, " " f.my_watched, f.my_state, f.my_file_state, f.my_storage, f.my_source, f.my_other " " FROM file f " @@ -621,7 +624,7 @@ File Database::getFileByTitle(const QString &title, int epno) " AND e.epno = :epno " "GROUP BY f.fid, f.eid, f.aid, f.gid, f.entry_added, f.anidb_update, f.entry_update, f.my_update, " " f.ed2k, f.size, f.length, f.extension, f.group_name, f.group_name_short, f.crc, " - " f.release_date, f.version, f.censored, f.type, f.quality_id, f.quality, f.resolution, " + " f.release_date, f.version, f.censored, f.source, f.quality_id, f.quality, f.resolution, " " f.video_codec, f.audio_codec, f.audio_language, f.subtitle_language, f.aspect_ratio, " " f.my_watched, f.my_state, f.my_file_state, f.my_storage, f.my_source, f.my_other "); @@ -648,7 +651,7 @@ bool Database::setAnime(const Anime &anime) " my_update = :myUpdate, title_english = :titleEnglish, " " title_romaji = :titleRomaji, title_kanji = :titleKanji, " " description = :description, year = :year, start_date = :startDate, " - " end_date = :endDate, type = :type, rating = :rating, votes = :votes, " + " end_date = :endDate, type = :type, total_episode_count = :totalEpisodeCount, highest_epno = :highestEpno, rating = :rating, votes = :votes, " " temp_rating = :tempRating, temp_votes = :tempVotes, my_vote = :myVote, " " my_vote_date = :myVoteDate, my_temp_vote = :myTempVote, " " my_temp_vote_date = :myTempVoteDate " @@ -666,6 +669,8 @@ bool Database::setAnime(const Anime &anime) q.bindValue(":startDate", anime.startDate); q.bindValue(":endDate", anime.endDate); q.bindValue(":type", anime.type); + q.bindValue(":totalEpisodeCount", anime.totalEpisodeCount); + q.bindValue(":highestEpno", anime.highestEpno); q.bindValue(":rating", anime.rating); q.bindValue(":votes", anime.votes); q.bindValue(":tempRating", anime.tempRating); @@ -781,8 +786,8 @@ bool Database::addAnime(const Anime &anime) { QSqlQuery &q = prepare( "INSERT INTO anime VALUES(:aid, DEFAULT, :anidbUpdate, :entryUpdate, :myUpdate, :titleEnglish, " - " :titleRomaji, :titleKanji, :description, :year, :startDate, :endDate, :type, " - " :rating, :votes, :tempRating, :tempVotes, :myVote, :myVoteDate, " + " :titleRomaji, :titleKanji, :description, :year, :startDate, :endDate, :type, :totalEpisodeCount, " + " :highestEpno, :rating, :votes, :tempRating, :tempVotes, :myVote, :myVoteDate, " " :myTempVote, :myTempVoteDate) "); q.bindValue(":aid", anime.aid); @@ -797,6 +802,8 @@ bool Database::addAnime(const Anime &anime) q.bindValue(":startDate", anime.startDate); q.bindValue(":endDate", anime.endDate); q.bindValue(":type", anime.type); + q.bindValue(":totalEpisodeCount", anime.totalEpisodeCount); + q.bindValue(":highestEpno", anime.highestEpno); q.bindValue(":rating", anime.rating); q.bindValue(":votes", anime.votes); q.bindValue(":tempRating", anime.tempRating); -- 2.52.0