From f18a646d09fb54847c9bfa4ca69447057a86a192 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Thu, 20 Apr 2023 11:29:49 -0500
Subject: [PATCH] Convert list joins to inner

---
 app/src/main/java/org/tasks/data/TaskListQuery.kt          | 6 +++---
 app/src/main/java/org/tasks/data/TaskListQueryRecursive.kt | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/tasks/data/TaskListQuery.kt b/app/src/main/java/org/tasks/data/TaskListQuery.kt
index 11144c01a..aa622d853 100644
--- a/app/src/main/java/org/tasks/data/TaskListQuery.kt
+++ b/app/src/main/java/org/tasks/data/TaskListQuery.kt
@@ -16,9 +16,9 @@ object TaskListQuery {
             Task.ID.eq(field("${TaskListFragment.CALDAV_METADATA_JOIN}.cd_task")),
             field("${TaskListFragment.CALDAV_METADATA_JOIN}.cd_deleted").eq(0))
     val JOINS = """
-        ${Join.left(CaldavTask.TABLE.`as`(TaskListFragment.CALDAV_METADATA_JOIN), JOIN_CALDAV)}
-        ${Join.left(CaldavCalendar.TABLE, field("${TaskListFragment.CALDAV_METADATA_JOIN}.cd_calendar").eq(CaldavCalendar.UUID))}
-        ${Join.left(CaldavAccount.TABLE, CaldavCalendar.ACCOUNT.eq(CaldavAccount.UUID))}
+        ${Join.inner(CaldavTask.TABLE.`as`(TaskListFragment.CALDAV_METADATA_JOIN), JOIN_CALDAV)}
+        ${Join.inner(CaldavCalendar.TABLE, field("${TaskListFragment.CALDAV_METADATA_JOIN}.cd_calendar").eq(CaldavCalendar.UUID))}
+        ${Join.inner(CaldavAccount.TABLE, CaldavCalendar.ACCOUNT.eq(CaldavAccount.UUID))}
         ${Join.left(Geofence.TABLE, Geofence.TASK.eq(Task.ID))}
         ${Join.left(Place.TABLE, Place.UID.eq(Geofence.PLACE))}
     """.trimIndent()
diff --git a/app/src/main/java/org/tasks/data/TaskListQueryRecursive.kt b/app/src/main/java/org/tasks/data/TaskListQueryRecursive.kt
index 6f689d185..86d981e70 100644
--- a/app/src/main/java/org/tasks/data/TaskListQueryRecursive.kt
+++ b/app/src/main/java/org/tasks/data/TaskListQueryRecursive.kt
@@ -79,8 +79,8 @@ internal object TaskListQueryRecursive {
                 ${
                     if (sortMode == SortHelper.SORT_LIST) {
                         """
-                            LEFT JOIN caldav_tasks on cd_task = tasks._id AND cd_deleted = 0
-                            LEFT JOIN caldav_lists on cd_calendar = cdl_uuid
+                            INNER JOIN caldav_tasks on cd_task = tasks._id AND cd_deleted = 0
+                            INNER JOIN caldav_lists on cd_calendar = cdl_uuid
                         """.trimIndent()
                     } else {
                         ""