Fix indices to remove warnings.

google · Feb 29, 2024 · 7c8da48 · 7c8da48
1 parent ef41487
commit 7c8da48
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...main/java/com/google/android/ground/persistence/local/room/entity/MultipleChoiceEntity.kt b/...main/java/com/google/android/ground/persistence/local/room/entity/MultipleChoiceEntity.kt
@@ -32,7 +32,7 @@ import com.google.android.ground.persistence.local.room.fields.MultipleChoiceEnt
       onDelete = ForeignKey.CASCADE
     )
   ],
-  indices = [Index("task_id", "job_id")],
+  indices = [Index("task_id"), Index("job_id")],
   primaryKeys = ["task_id", "job_id"],
 )
 data class MultipleChoiceEntity(

diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/OptionEntity.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/OptionEntity.kt
@@ -31,8 +31,8 @@ import androidx.room.Index
       onDelete = ForeignKey.CASCADE
     )
   ],
-  indices = [Index("task_id", "job_id")],
-  primaryKeys = ["id", "job_id"],
+  indices = [Index("task_id"), Index("job_id")],
+  primaryKeys = ["task_id", "job_id"],
 )
 data class OptionEntity(
   @ColumnInfo(name = "id") val id: String,

diff --git a/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/TaskEntity.kt b/ground/src/main/java/com/google/android/ground/persistence/local/room/entity/TaskEntity.kt
@@ -32,16 +32,16 @@ import com.google.android.ground.persistence.local.room.fields.TaskEntityType
       onDelete = ForeignKey.CASCADE
     )
   ],
-  indices = [Index("id", "job_id")],
+  indices = [Index("id"), Index("job_id")],
   primaryKeys = ["id", "job_id"],
 )
 data class TaskEntity(
   @ColumnInfo(name = "id") val id: String,
-  @ColumnInfo(name = "job_id") val jobId: String,
   @ColumnInfo(name = "index") val index: Int,
   @ColumnInfo(name = "task_type") val taskType: TaskEntityType,
   @ColumnInfo(name = "label") val label: String?,
   @ColumnInfo(name = "is_required") val isRequired: Boolean,
+  @ColumnInfo(name = "job_id") val jobId: String,
   // Deprecated.
   @ColumnInfo(name = "is_add_loi_task") val isAddLoiTask: Boolean
 )