Remove FilterDao.getAll()

pull/1296/head
Alex Baker 4 years ago
parent af2894f8f4
commit cff034084c

@ -65,7 +65,7 @@ class Upgrader @Inject constructor(
run(from, V9_7) { googleTaskListDao.resetOrders() }
run(from, V9_7_3) { googleTaskDao.updateParents() }
run(from, V10_0_2) {
filterDao.getAll()
filterDao.getFilters()
.filter { it.getSql().trim() == "WHERE" }
.forEach { filterDao.delete(it) }
}
@ -173,7 +173,7 @@ class Upgrader @Inject constructor(
}
private suspend fun migrateGoogleTaskFilters() {
for (filter in filterDao.getAll()) {
for (filter in filterDao.getFilters()) {
filter.setSql(migrateGoogleTaskFilters(filter.getSql()))
filter.criterion = migrateGoogleTaskFilters(filter.criterion)
filterDao.update(filter)
@ -181,7 +181,7 @@ class Upgrader @Inject constructor(
}
private suspend fun migrateCaldavFilters() {
for (filter in filterDao.getAll()) {
for (filter in filterDao.getFilters()) {
filter.setSql(migrateCaldavFilters(filter.getSql()))
filter.criterion = migrateCaldavFilters(filter.criterion)
filterDao.update(filter)

@ -127,7 +127,7 @@ class TasksJsonExporter @Inject constructor(
taskBackups,
locationDao.getPlaces(),
tagDataDao.getAll(),
filterDao.getAll(),
filterDao.getFilters(),
googleTaskListDao.getAccounts(),
googleTaskListDao.getAllLists(),
caldavDao.getAccounts(),

@ -26,9 +26,6 @@ interface FilterDao {
@Query("SELECT * FROM filters WHERE _id = :id LIMIT 1")
suspend fun getById(id: Long): Filter?
@Query("SELECT * FROM filters")
suspend fun getAll(): List<Filter>
@Query("UPDATE filters SET f_order = $NO_ORDER")
suspend fun resetOrders()

Loading…
Cancel
Save