Update Room to 2.7

data-local/src/main/java/com/michaldrabik/data_local/database/dao/ArchiveMoviesDao.kt

@@ -14,12 +14,56 @@ import com.michaldrabik.data_local.sources.ArchiveMoviesLocalDataSource
 interface ArchiveMoviesDao : ArchiveMoviesLocalDataSource {
 
   @Query(
-    "SELECT movies.*, movies_archive.created_at AS created_at, movies_archive.updated_at AS updated_at FROM movies INNER JOIN movies_archive USING(id_trakt)",
+    "SELECT " +
+      "movies.id_trakt, " +
+      "movies.id_tmdb, " +
+      "movies.id_imdb, " +
+      "movies.id_slug, " +
+      "movies.title, " +
+      "movies.year, " +
+      "movies.overview, " +
+      "movies.released, " +
+      "movies.runtime, " +
+      "movies.country, " +
+      "movies.trailer, " +
+      "movies.language, " +
+      "movies.homepage, " +
+      "movies.status, " +
+      "movies.rating, " +
+      "movies.votes, " +
+      "movies.comment_count, " +
+      "movies.genres, " +
+      "movies_archive.updated_at, " +
+      "movies_archive.created_at " +
+      "FROM movies " +
+      "INNER JOIN movies_archive USING(id_trakt)",
   )
   override suspend fun getAll(): List<Movie>
 
   @Query(
-    "SELECT movies.*, movies_archive.created_at AS created_at, movies_archive.updated_at AS updated_at FROM movies INNER JOIN movies_archive USING(id_trakt) WHERE id_trakt IN (:ids)",
+    "SELECT " +
+      "movies.id_trakt, " +
+      "movies.id_tmdb, " +
+      "movies.id_imdb, " +
+      "movies.id_slug, " +
+      "movies.title, " +
+      "movies.year, " +
+      "movies.overview, " +
+      "movies.released, " +
+      "movies.runtime, " +
+      "movies.country, " +
+      "movies.trailer, " +
+      "movies.language, " +
+      "movies.homepage, " +
+      "movies.status, " +
+      "movies.rating, " +
+      "movies.votes, " +
+      "movies.comment_count, " +
+      "movies.genres, " +
+      "movies_archive.updated_at, " +
+      "movies_archive.created_at " +
+      "FROM movies " +
+      "INNER JOIN movies_archive USING(id_trakt) WHERE id_trakt IN (:ids)",
   )
   override suspend fun getAll(ids: List<Long>): List<Movie>
 

data-local/src/main/java/com/michaldrabik/data_local/database/dao/ArchiveShowsDao.kt

@@ -14,12 +14,70 @@ import com.michaldrabik.data_local.sources.ArchiveShowsLocalDataSource
 interface ArchiveShowsDao : ArchiveShowsLocalDataSource {
 
   @Query(
-    "SELECT shows.*, shows_archive.created_at AS created_at, shows_archive.updated_at AS updated_at FROM shows INNER JOIN shows_archive USING(id_trakt)",
+    "SELECT " +
+      "shows.id_trakt, " +
+      "shows.id_tvdb, " +
+      "shows.id_tmdb, " +
+      "shows.id_imdb, " +
+      "shows.id_slug, " +
+      "shows.id_tvrage, " +
+      "shows.title, " +
+      "shows.year, " +
+      "shows.overview, " +
+      "shows.first_aired, " +
+      "shows.runtime, " +
+      "shows.airtime_day, " +
+      "shows.airtime_time, " +
+      "shows.airtime_timezone, " +
+      "shows.certification, " +
+      "shows.network, " +
+      "shows.country, " +
+      "shows.trailer, " +
+      "shows.homepage, " +
+      "shows.status, " +
+      "shows.rating, " +
+      "shows.votes, " +
+      "shows.comment_count, " +
+      "shows.genres, " +
+      "shows.aired_episodes, " +
+      "shows_archive.updated_at, " +
+      "shows_archive.created_at " +
+      "FROM shows " +
+      "INNER JOIN shows_archive USING(id_trakt)",
   )
   override suspend fun getAll(): List<Show>
 
   @Query(
-    "SELECT shows.*, shows_archive.created_at AS created_at, shows_archive.updated_at AS updated_at FROM shows INNER JOIN shows_archive USING(id_trakt) WHERE id_trakt IN (:ids)",
+    "SELECT " +
+      "shows.id_trakt, " +
+      "shows.id_tvdb, " +
+      "shows.id_tmdb, " +
+      "shows.id_imdb, " +
+      "shows.id_slug, " +
+      "shows.id_tvrage, " +
+      "shows.title, " +
+      "shows.year, " +
+      "shows.overview, " +
+      "shows.first_aired, " +
+      "shows.runtime, " +
+      "shows.airtime_day, " +
+      "shows.airtime_time, " +
+      "shows.airtime_timezone, " +
+      "shows.certification, " +
+      "shows.network, " +
+      "shows.country, " +
+      "shows.trailer, " +
+      "shows.homepage, " +
+      "shows.status, " +
+      "shows.rating, " +
+      "shows.votes, " +
+      "shows.comment_count, " +
+      "shows.genres, " +
+      "shows.aired_episodes, " +
+      "shows_archive.updated_at, " +
+      "shows_archive.created_at " +
+      "FROM shows " +
+      "INNER JOIN shows_archive USING(id_trakt) WHERE id_trakt IN (:ids)",
   )
   override suspend fun getAll(ids: List<Long>): List<Show>
 

data-local/src/main/java/com/michaldrabik/data_local/database/dao/MovieCollectionsItemsDao.kt

@@ -15,7 +15,31 @@ interface MovieCollectionsItemsDao :
   MovieCollectionsItemsLocalDataSource {
 
   @Query(
-    "SELECT movies.*, movies_collections_items.created_at, movies_collections_items.updated_at FROM movies INNER JOIN movies_collections_items USING(id_trakt) WHERE id_trakt_collection == :collectionId ORDER BY rank ASC",
+    """
+    SELECT
+    movies.id_trakt,
+    movies.id_tmdb,
+    movies.id_imdb,
+    movies.id_slug,
+    movies.title,
+    movies.year,
+    movies.overview,
+    movies.released,
+    movies.runtime,
+    movies.country,
+    movies.trailer,
+    movies.language,
+    movies.homepage,
+    movies.status,
+    movies.rating,
+    movies.votes,
+    movies.comment_count,
+    movies.genres,
+    movies_collections_items.updated_at AS updated_at,
+    movies_collections_items.created_at AS created_at
+    FROM movies INNER JOIN movies_collections_items USING(id_trakt)
+    WHERE id_trakt_collection == :collectionId
+    ORDER BY rank ASC""",
   )
   override suspend fun getById(collectionId: Long): List<Movie>
 

data-local/src/main/java/com/michaldrabik/data_local/database/dao/MyMoviesDao.kt

@@ -12,13 +12,55 @@ import com.michaldrabik.data_local.sources.MyMoviesLocalDataSource
 interface MyMoviesDao : MyMoviesLocalDataSource {
 
   @Query(
-    "SELECT movies.*, movies_my_movies.updated_at AS updated_at FROM movies " +
+    "SELECT " +
+      "movies.id_trakt, " +
+      "movies.id_tmdb, " +
+      "movies.id_imdb, " +
+      "movies.id_slug, " +
+      "movies.title, " +
+      "movies.year, " +
+      "movies.overview, " +
+      "movies.released, " +
+      "movies.runtime, " +
+      "movies.country, " +
+      "movies.trailer, " +
+      "movies.language, " +
+      "movies.homepage, " +
+      "movies.status, " +
+      "movies.rating, " +
+      "movies.votes, " +
+      "movies.comment_count, " +
+      "movies.genres, " +
+      "movies_my_movies.updated_at, " +
+      "movies_my_movies.created_at " +
+      "FROM movies " +
       "INNER JOIN movies_my_movies USING(id_trakt)",
   )
   override suspend fun getAll(): List<Movie>
 
   @Query(
-    "SELECT movies.*, movies_my_movies.updated_at AS updated_at FROM movies " +
+    "SELECT " +
+      "movies.id_trakt, " +
+      "movies.id_tmdb, " +
+      "movies.id_imdb, " +
+      "movies.id_slug, " +
+      "movies.title, " +
+      "movies.year, " +
+      "movies.overview, " +
+      "movies.released, " +
+      "movies.runtime, " +
+      "movies.country, " +
+      "movies.trailer, " +
+      "movies.language, " +
+      "movies.homepage, " +
+      "movies.status, " +
+      "movies.rating, " +
+      "movies.votes, " +
+      "movies.comment_count, " +
+      "movies.genres, " +
+      "movies.created_at, " +
+      "movies_my_movies.updated_at " +
+      "FROM movies " +
       "INNER JOIN movies_my_movies USING(id_trakt) WHERE id_trakt IN (:ids)",
   )
   override suspend fun getAll(ids: List<Long>): List<Movie>
@@ -33,7 +75,29 @@ interface MyMoviesDao : MyMoviesLocalDataSource {
   override suspend fun getAllTraktIds(): List<Long>
 
   @Query(
-    "SELECT movies.*, movies_my_movies.updated_at AS updated_at FROM movies INNER JOIN movies_my_movies USING(id_trakt) WHERE id_trakt == :traktId",
+    "SELECT " +
+      "movies.id_trakt, " +
+      "movies.id_tmdb, " +
+      "movies.id_imdb, " +
+      "movies.id_slug, " +
+      "movies.title, " +
+      "movies.year, " +
+      "movies.overview, " +
+      "movies.released, " +
+      "movies.runtime, " +
+      "movies.country, " +
+      "movies.trailer, " +
+      "movies.language, " +
+      "movies.homepage, " +
+      "movies.status, " +
+      "movies.rating, " +
+      "movies.votes, " +
+      "movies.comment_count, " +
+      "movies.genres, " +
+      "movies.created_at, " +
+      "movies_my_movies.updated_at " +
+      "FROM movies " +
+      "INNER JOIN movies_my_movies USING(id_trakt) WHERE id_trakt == :traktId",
   )
   override suspend fun getById(traktId: Long): Movie?
 

data-local/src/main/java/com/michaldrabik/data_local/database/dao/MyShowsDao.kt

@@ -14,12 +14,70 @@ import com.michaldrabik.data_local.sources.MyShowsLocalDataSource
 interface MyShowsDao : MyShowsLocalDataSource {
 
   @Query(
-    "SELECT shows.*, shows_my_shows.created_at AS created_at, shows_my_shows.last_watched_at AS updated_at FROM shows INNER JOIN shows_my_shows USING(id_trakt)",
+    "SELECT " +
+      "shows.id_trakt, " +
+      "shows.id_tvdb, " +
+      "shows.id_tmdb, " +
+      "shows.id_imdb, " +
+      "shows.id_slug, " +
+      "shows.id_tvrage, " +
+      "shows.title, " +
+      "shows.year, " +
+      "shows.overview, " +
+      "shows.first_aired, " +
+      "shows.runtime, " +
+      "shows.airtime_day, " +
+      "shows.airtime_time, " +
+      "shows.airtime_timezone, " +
+      "shows.certification, " +
+      "shows.network, " +
+      "shows.country, " +
+      "shows.trailer, " +
+      "shows.homepage, " +
+      "shows.status, " +
+      "shows.rating, " +
+      "shows.votes, " +
+      "shows.comment_count, " +
+      "shows.genres, " +
+      "shows.aired_episodes, " +
+      "shows_my_shows.last_watched_at AS updated_at, " +
+      "shows_my_shows.created_at " +
+      "FROM shows " +
+      "INNER JOIN shows_my_shows USING(id_trakt)",
   )
   override suspend fun getAll(): List<Show>
 
   @Query(
-    "SELECT shows.*, shows_my_shows.created_at AS created_at, shows_my_shows.last_watched_at AS updated_at FROM shows INNER JOIN shows_my_shows USING(id_trakt) WHERE id_trakt IN (:ids)",
+    "SELECT " +
+      "shows.id_trakt, " +
+      "shows.id_tvdb, " +
+      "shows.id_tmdb, " +
+      "shows.id_imdb, " +
+      "shows.id_slug, " +
+      "shows.id_tvrage, " +
+      "shows.title, " +
+      "shows.year, " +
+      "shows.overview, " +
+      "shows.first_aired, " +
+      "shows.runtime, " +
+      "shows.airtime_day, " +
+      "shows.airtime_time, " +
+      "shows.airtime_timezone, " +
+      "shows.certification, " +
+      "shows.network, " +
+      "shows.country, " +
+      "shows.trailer, " +
+      "shows.homepage, " +
+      "shows.status, " +
+      "shows.rating, " +
+      "shows.votes, " +
+      "shows.comment_count, " +
+      "shows.genres, " +
+      "shows.aired_episodes, " +
+      "shows_my_shows.last_watched_at AS updated_at, " +
+      "shows_my_shows.created_at " +
+      "FROM shows " +
+      "INNER JOIN shows_my_shows USING(id_trakt) WHERE id_trakt IN (:ids)",
   )
   override suspend fun getAll(ids: List<Long>): List<Show>
 

data-local/src/main/java/com/michaldrabik/data_local/database/dao/PeopleCreditsDao.kt

@@ -14,14 +14,69 @@ import com.michaldrabik.data_local.sources.PeopleCreditsLocalDataSource
 interface PeopleCreditsDao : BaseDao<PersonCredits>, PeopleCreditsLocalDataSource {
 
   @Query(
-    "SELECT shows.*, people_credits.created_at AS created_at, people_credits.updated_at AS updated_at FROM shows " +
-      "INNER JOIN people_credits ON people_credits.id_trakt_show = shows.id_trakt WHERE people_credits.id_trakt_person = :personTraktId"
+    """
+    SELECT
+    shows.id_trakt,
+    shows.id_tvdb,
+    shows.id_tmdb,
+    shows.id_imdb,
+    shows.id_slug,
+    shows.id_tvrage,
+    shows.title,
+    shows.year,
+    shows.overview,
+    shows.first_aired,
+    shows.runtime,
+    shows.airtime_day,
+    shows.airtime_time,
+    shows.airtime_timezone,
+    shows.certification,
+    shows.network,
+    shows.country,
+    shows.trailer,
+    shows.homepage,
+    shows.status,
+    shows.rating,
+    shows.votes,
+    shows.comment_count,
+    shows.genres,
+    shows.aired_episodes,
+    people_credits.created_at AS created_at,
+    people_credits.updated_at AS updated_at
+    FROM shows
+    INNER JOIN people_credits ON people_credits.id_trakt_show = shows.id_trakt
+    WHERE people_credits.id_trakt_person = :personTraktId
+    """
   )
   override suspend fun getAllShowsForPerson(personTraktId: Long): List<Show>
 
   @Query(
-    "SELECT movies.*, people_credits.created_at AS created_at, people_credits.updated_at AS updated_at FROM movies " +
-      "INNER JOIN people_credits ON people_credits.id_trakt_movie = movies.id_trakt WHERE people_credits.id_trakt_person = :personTraktId"
+    """
+    SELECT
+    movies.id_trakt,
+    movies.id_tmdb,
+    movies.id_imdb,
+    movies.id_slug,
+    movies.title,
+    movies.year,
+    movies.overview,
+    movies.released,
+    movies.runtime,
+    movies.country,
+    movies.trailer,
+    movies.language,
+    movies.homepage,
+    movies.status,
+    movies.rating,
+    movies.votes,
+    movies.comment_count,
+    movies.genres,
+    people_credits.updated_at AS updated_at,
+    people_credits.created_at AS created_at
+    FROM movies
+    INNER JOIN people_credits ON people_credits.id_trakt_movie = movies.id_trakt
+    WHERE people_credits.id_trakt_person = :personTraktId
+    """
   )
   override suspend fun getAllMoviesForPerson(personTraktId: Long): List<Movie>
 

data-local/src/main/java/com/michaldrabik/data_local/database/dao/PeopleDao.kt

@@ -27,11 +27,59 @@ interface PeopleDao : BaseDao<Person>, PeopleLocalDataSource {
   override suspend fun getById(tmdbId: Long): Person?
 
   @Query(
-    "SELECT people.*, people_shows_movies.department AS department, people_shows_movies.character AS character, people_shows_movies.job AS job, people_shows_movies.episodes_count AS episodes_count FROM people INNER JOIN people_shows_movies ON people_shows_movies.id_tmdb_person = people.id_tmdb WHERE people_shows_movies.id_trakt_show = :showTraktId"
+    """
+    SELECT
+    people.id_tmdb,
+    people.id_trakt,
+    people.id_imdb,
+    people.name,
+    people.biography,
+    people.biography_translation,
+    people.birthday,
+    people.birthplace,
+    people.deathday,
+    people.image_path,
+    people.homepage,
+    people.created_at,
+    people.updated_at,
+    people.details_updated_at,
+    people_shows_movies.department AS department,
+    people_shows_movies.character AS character,
+    people_shows_movies.job AS job,
+    people_shows_movies.episodes_count AS episodes_count
+    FROM people
+    INNER JOIN people_shows_movies ON people_shows_movies.id_tmdb_person = people.id_tmdb
+    WHERE people_shows_movies.id_trakt_show = :showTraktId
+    """
   )
   override suspend fun getAllForShow(showTraktId: Long): List<Person>
 
-  @Query("SELECT people.*, people_shows_movies.department AS department, people_shows_movies.character AS character, people_shows_movies.job AS job, people_shows_movies.episodes_count AS episodes_count FROM people INNER JOIN people_shows_movies ON people_shows_movies.id_tmdb_person = people.id_tmdb WHERE people_shows_movies.id_trakt_movie = :movieTraktId")
+  @Query(
+    """
+    SELECT
+    people.id_tmdb,
+    people.id_trakt,
+    people.id_imdb,
+    people.name,
+    people.biography,
+    people.biography_translation,
+    people.birthday,
+    people.birthplace,
+    people.deathday,
+    people.image_path,
+    people.homepage,
+    people.created_at,
+    people.updated_at,
+    people.details_updated_at,
+    people_shows_movies.department AS department,
+    people_shows_movies.character AS character,
+    people_shows_movies.job AS job,
+    people_shows_movies.episodes_count AS episodes_count
+    FROM people
+    INNER JOIN people_shows_movies ON people_shows_movies.id_tmdb_person = people.id_tmdb
+    WHERE people_shows_movies.id_trakt_movie = :movieTraktId
+    """
+  )
   override suspend fun getAllForMovie(movieTraktId: Long): List<Person>
 
   @Query("SELECT * FROM people")

data-local/src/main/java/com/michaldrabik/data_local/database/dao/WatchlistMoviesDao.kt

@@ -12,7 +12,28 @@ import com.michaldrabik.data_local.sources.WatchlistMoviesLocalDataSource
 interface WatchlistMoviesDao : WatchlistMoviesLocalDataSource {
 
   @Query(
-    "SELECT movies.*, movies_see_later.created_at, movies_see_later.updated_at FROM movies " +
+    "SELECT " +
+      "movies.id_trakt, " +
+      "movies.id_tmdb, " +
+      "movies.id_imdb, " +
+      "movies.id_slug, " +
+      "movies.title, " +
+      "movies.year, " +
+      "movies.overview, " +
+      "movies.released, " +
+      "movies.runtime, " +
+      "movies.country, " +
+      "movies.trailer, " +
+      "movies.language, " +
+      "movies.homepage, " +
+      "movies.status, " +
+      "movies.rating, " +
+      "movies.votes, " +
+      "movies.comment_count, " +
+      "movies.genres, " +
+      "movies_see_later.updated_at, " +
+      "movies_see_later.created_at " +
+      "FROM movies " +
       "INNER JOIN movies_see_later USING(id_trakt)",
   )
   override suspend fun getAll(): List<Movie>

data-local/src/main/java/com/michaldrabik/data_local/database/dao/WatchlistShowsDao.kt

@@ -14,7 +14,36 @@ import com.michaldrabik.data_local.sources.WatchlistShowsLocalDataSource
 interface WatchlistShowsDao : WatchlistShowsLocalDataSource {
 
   @Query(
-    "SELECT shows.*, shows_see_later.created_at AS created_at, shows_see_later.updated_at AS updated_at FROM shows INNER JOIN shows_see_later USING(id_trakt)",
+    "SELECT " +
+      "shows.id_trakt, " +
+      "shows.id_tvdb, " +
+      "shows.id_tmdb, " +
+      "shows.id_imdb, " +
+      "shows.id_slug, " +
+      "shows.id_tvrage, " +
+      "shows.title, " +
+      "shows.year, " +
+      "shows.overview, " +
+      "shows.first_aired, " +
+      "shows.runtime, " +
+      "shows.airtime_day, " +
+      "shows.airtime_time, " +
+      "shows.airtime_timezone, " +
+      "shows.certification, " +
+      "shows.network, " +
+      "shows.country, " +
+      "shows.trailer, " +
+      "shows.homepage, " +
+      "shows.status, " +
+      "shows.rating, " +
+      "shows.votes, " +
+      "shows.comment_count, " +
+      "shows.genres, " +
+      "shows.aired_episodes, " +
+      "shows_see_later.updated_at, " +
+      "shows_see_later.created_at " +
+      "FROM shows " +
+      "INNER JOIN shows_see_later USING(id_trakt)",
   )
   override suspend fun getAll(): List<Show>
 

gradle/libs.versions.toml

@@ -5,7 +5,7 @@ androidLifecycle = "2.8.7"
 androidNavigation = "2.8.9"
 # Reverted as 2.7.0 started returning different results for queries. Investigating.
 # https://issuetracker.google.com/issues/410288395
-androidRoom = "2.6.1"
+androidRoom = "2.7.1"
 androidTestRunner = "1.6.2"
 androidTestTruth = "1.6.0"
 appcompat = "1.7.0"