From 9016a7b6287539002421f85ee43accd56c0cff34 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Fri, 24 Jan 2025 23:49:42 -0600
Subject: [PATCH] Use ColumnInfo for recursive fields

---
 .../commonMain/kotlin/org/tasks/data/TaskContainer.kt  | 10 +++++-----
 .../kotlin/org/tasks/data/TaskListQueryRecursive.kt    |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/data/src/commonMain/kotlin/org/tasks/data/TaskContainer.kt b/data/src/commonMain/kotlin/org/tasks/data/TaskContainer.kt
index f056086d0..921f16e76 100644
--- a/data/src/commonMain/kotlin/org/tasks/data/TaskContainer.kt
+++ b/data/src/commonMain/kotlin/org/tasks/data/TaskContainer.kt
@@ -2,23 +2,23 @@ package org.tasks.data
 
 import androidx.room.ColumnInfo
 import androidx.room.Embedded
-import org.tasks.data.entity.Task
 import org.tasks.data.entity.CaldavAccount
 import org.tasks.data.entity.CaldavAccount.Companion.TYPE_GOOGLE_TASKS
 import org.tasks.data.entity.CaldavAccount.Companion.TYPE_MICROSOFT
 import org.tasks.data.entity.CaldavTask
+import org.tasks.data.entity.Task
 
 data class TaskContainer(
     @Embedded val task: Task,
     @Embedded val caldavTask: CaldavTask? = null,
     @Embedded val location: Location? = null,
     val accountType: Int = CaldavAccount.TYPE_LOCAL,
-    val parentComplete: Boolean = false,
+    @ColumnInfo(name = "parent_complete") val parentComplete: Boolean = false,
     @ColumnInfo(name = "tags") val tagsString: String? = null,
     val children: Int = 0,
-    val sortGroup: Long? = null,
-    val primarySort: Long = 0,
-    val secondarySort: Long = 0,
+    @ColumnInfo(name = "sort_group") val sortGroup: Long? = null,
+    @ColumnInfo(name = "primary_sort") val primarySort: Long = 0,
+    @ColumnInfo(name = "secondary_sort") val secondarySort: Long = 0,
     var indent: Int = 0,
     var targetIndent: Int = 0,
 ){
diff --git a/kmp/src/commonMain/kotlin/org/tasks/data/TaskListQueryRecursive.kt b/kmp/src/commonMain/kotlin/org/tasks/data/TaskListQueryRecursive.kt
index 0047e1584..beba92deb 100644
--- a/kmp/src/commonMain/kotlin/org/tasks/data/TaskListQueryRecursive.kt
+++ b/kmp/src/commonMain/kotlin/org/tasks/data/TaskListQueryRecursive.kt
@@ -25,11 +25,11 @@ internal object TaskListQueryRecursive {
                         Query.select(field("group_concat(distinct(tag_uid))")).from(Tag.TABLE).where(
                         Task.ID.eq(Tag.TASK))} GROUP BY ${Tag.TASK})").`as`("tags"),
                     field("indent"),
-                    field("sort_group").`as`("sortGroup"),
+                    field("sort_group"),
                     field("children"),
-                    field("primary_sort").`as`("primarySort"),
-                    field("secondary_sort").`as`("secondarySort"),
-                    field("parent_complete").`as`("parentComplete"),
+                    field("primary_sort"),
+                    field("secondary_sort"),
+                    field("parent_complete"),
             )).toTypedArray()
     private val JOINS = """
         ${Join.inner(RECURSIVE, Task.ID.eq(RECURSIVE_TASK))}