Use ColumnInfo for recursive fields

pull/3302/head
Alex Baker 10 months ago
parent 70dd8932a9
commit 9016a7b628

@ -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,
){

@ -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))}

Loading…
Cancel
Save