Skip to content

Commit 46fad32

Browse files
authored
Merge pull request #7905 from Stypox/fix-room-unused-columns
Fix Room warning about unused columns during build
2 parents 5be40f6 + a8a96b7 commit 46fad32

3 files changed

Lines changed: 7 additions & 0 deletions

File tree

app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import androidx.annotation.Nullable;
44
import androidx.room.Dao;
55
import androidx.room.Query;
6+
import androidx.room.RewriteQueriesToDropUnusedColumns;
67

78
import org.schabi.newpipe.database.history.model.StreamHistoryEntity;
89
import org.schabi.newpipe.database.history.model.StreamHistoryEntry;
@@ -67,6 +68,7 @@ public Flowable<List<StreamHistoryEntity>> listByService(final int serviceId) {
6768
@Query("DELETE FROM " + STREAM_HISTORY_TABLE + " WHERE " + JOIN_STREAM_ID + " = :streamId")
6869
public abstract int deleteStreamHistory(long streamId);
6970

71+
@RewriteQueriesToDropUnusedColumns
7072
@Query("SELECT * FROM " + STREAM_TABLE
7173

7274
// Select the latest entry and watch count for each stream id on history table

app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistStreamDAO.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import androidx.room.Dao;
44
import androidx.room.Query;
5+
import androidx.room.RewriteQueriesToDropUnusedColumns;
56
import androidx.room.Transaction;
67

78
import org.schabi.newpipe.database.BasicDAO;
@@ -52,6 +53,7 @@ default Flowable<List<PlaylistStreamEntity>> listByService(final int serviceId)
5253
+ " WHERE " + JOIN_PLAYLIST_ID + " = :playlistId")
5354
Flowable<Integer> getMaximumIndexOf(long playlistId);
5455

56+
@RewriteQueriesToDropUnusedColumns
5557
@Transaction
5658
@Query("SELECT * FROM " + STREAM_TABLE + " INNER JOIN "
5759
// get ids of streams of the given playlist

app/src/main/java/org/schabi/newpipe/database/subscription/SubscriptionDAO.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import androidx.room.Dao
44
import androidx.room.Insert
55
import androidx.room.OnConflictStrategy
66
import androidx.room.Query
7+
import androidx.room.RewriteQueriesToDropUnusedColumns
78
import androidx.room.Transaction
89
import io.reactivex.rxjava3.core.Flowable
910
import io.reactivex.rxjava3.core.Maybe
@@ -31,6 +32,7 @@ abstract class SubscriptionDAO : BasicDAO<SubscriptionEntity> {
3132
)
3233
abstract fun getSubscriptionsFiltered(filter: String): Flowable<List<SubscriptionEntity>>
3334

35+
@RewriteQueriesToDropUnusedColumns
3436
@Query(
3537
"""
3638
SELECT * FROM subscriptions s
@@ -47,6 +49,7 @@ abstract class SubscriptionDAO : BasicDAO<SubscriptionEntity> {
4749
currentGroupId: Long
4850
): Flowable<List<SubscriptionEntity>>
4951

52+
@RewriteQueriesToDropUnusedColumns
5053
@Query(
5154
"""
5255
SELECT * FROM subscriptions s

0 commit comments

Comments
 (0)