Update Google Task and CalDAV filter query

pull/848/head
Alex Baker 5 years ago
parent dc4ab11583
commit e3bd86c7e8

@ -25,7 +25,7 @@ android {
defaultConfig {
testApplicationId = "org.tasks.test"
applicationId = "org.tasks"
versionCode = 593
versionCode = 594
versionName = "6.8.0"
targetSdkVersion(Versions.compileSdk)
minSdkVersion(Versions.minSdk)

@ -90,8 +90,8 @@ public interface CaldavDao {
@Query(
"SELECT caldav_lists.*, caldav_accounts.*, COUNT(tasks._id) AS count"
+ " FROM caldav_lists"
+ " LEFT JOIN caldav_accounts ON caldav_lists.cdl_account = caldav_accounts.cda_uuid"
+ " FROM caldav_accounts"
+ " LEFT JOIN caldav_lists ON caldav_lists.cdl_account = caldav_accounts.cda_uuid"
+ " LEFT JOIN caldav_tasks ON caldav_tasks.cd_calendar = caldav_lists.cdl_uuid"
+ " LEFT JOIN tasks ON caldav_tasks.cd_task = tasks._id AND tasks.deleted = 0 AND tasks.completed = 0 AND tasks.hideUntil < :now"
+ " GROUP BY caldav_lists.cdl_uuid"

@ -58,8 +58,8 @@ public abstract class GoogleTaskListDao {
@Query(
"SELECT google_task_lists.*, google_task_accounts.*, COUNT(tasks._id) AS count"
+ " FROM google_task_lists"
+ " LEFT JOIN google_task_accounts ON google_task_lists.gtl_account = google_task_accounts.gta_account"
+ " FROM google_task_accounts "
+ " LEFT JOIN google_task_lists ON google_task_lists.gtl_account = google_task_accounts.gta_account"
+ " LEFT JOIN google_tasks ON google_tasks.gt_list_id = google_task_lists.gtl_remote_id"
+ " LEFT JOIN tasks ON google_tasks.gt_task = tasks._id AND tasks.deleted = 0 AND tasks.completed = 0 AND tasks.hideUntil < :now"
+ " GROUP BY google_task_lists.gtl_remote_id"

Loading…
Cancel
Save