Handle diffrences in column naming

Author: grzesiek2010

collect_app/src/main/java/org/odk/collect/android/database/entities/DatabaseEntitiesRepository.kt

@@ -28,7 +28,7 @@ private object ListsTable {
     const val COLUMN_HASH = "hash"
 }
 
-private object EntitiesTable {
+object EntitiesTable {
     const val COLUMN_ID = "id"
     const val COLUMN_LABEL = "label"
     const val COLUMN_VERSION = "version"
@@ -220,15 +220,17 @@ class DatabaseEntitiesRepository(context: Context, dbPath: String) : EntitiesRep
             }
         } else {
             databaseConnection.withConnection {
+                val querySelectionAndArgs = query.toSqlite()
+
                 readableDatabase
                     .rawQuery(
                         """
                         SELECT *, i.$ROW_ID
                         FROM "$list" e, "${getRowIdTableName(list)}" i
-                        WHERE e._id = i._id AND ${query.selection}
+                        WHERE e._id = i._id AND ${querySelectionAndArgs.selection}
                         ORDER BY i.$ROW_ID
                         """.trimIndent(),
-                        query.selectionArgs
+                        querySelectionAndArgs.selectionArgs
                     )
             }
         }.foldAndClose {

collect_app/src/main/java/org/odk/collect/android/database/entities/QueryExt.kt

@@ -0,0 +1,51 @@
+package org.odk.collect.android.database.entities
+
+import org.odk.collect.android.database.entities.EntitiesTable.getPropertyColumn
+import org.odk.collect.db.sqlite.Query
+import org.odk.collect.db.sqlite.QuerySelectionAndArgs
+import org.odk.collect.entities.javarosa.parse.EntityItemElement
+
+fun Query.toSqlite(): QuerySelectionAndArgs {
+    return when (this) {
+        is Query.Eq -> {
+            val columnName = getColumnName(column)
+
+            QuerySelectionAndArgs("$columnName = ?", arrayOf(value))
+        }
+
+        is Query.NotEq -> {
+            val columnName = getColumnName(column)
+
+            QuerySelectionAndArgs("$columnName != ?", arrayOf(value))
+        }
+
+        is Query.And -> {
+            val queryAResult = queryA.toSqlite()
+            val queryBResult = queryB.toSqlite()
+
+            QuerySelectionAndArgs(
+                "(${queryAResult.selection} AND ${queryBResult.selection})",
+                queryAResult.selectionArgs + queryBResult.selectionArgs
+            )
+        }
+
+        is Query.Or -> {
+            val queryAResult = queryA.toSqlite()
+            val queryBResult = queryB.toSqlite()
+
+            QuerySelectionAndArgs(
+                "(${queryAResult.selection} OR ${queryBResult.selection})",
+                queryAResult.selectionArgs + queryBResult.selectionArgs
+            )
+        }
+    }
+}
+
+private fun getColumnName(column: String): String {
+    return when (column) {
+        EntityItemElement.ID -> EntitiesTable.COLUMN_ID
+        EntityItemElement.LABEL -> EntitiesTable.COLUMN_LABEL
+        EntityItemElement.VERSION -> EntitiesTable.COLUMN_VERSION
+        else -> getPropertyColumn(column)
+    }
+}

db/src/main/java/org/odk/collect/db/sqlite/Query.kt

@@ -1,26 +1,16 @@
 package org.odk.collect.db.sqlite
 
-sealed class Query(
-    val selection: String,
-    val selectionArgs: Array<String>
-) {
-    class Eq(val column: String, val value: String) : Query(
-        "$column = ?",
-        arrayOf(value)
-    )
+sealed interface Query {
+    class Eq(val column: String, val value: String) : Query
 
-    class NotEq(val column: String, val value: String) : Query(
-        "$column != ?",
-        arrayOf(value)
-    )
+    class NotEq(val column: String, val value: String) : Query
 
-    class And(val queryA: Query, val queryB: Query) : Query(
-        "(${queryA.selection} AND ${queryB.selection})",
-        queryA.selectionArgs + queryB.selectionArgs
-    )
+    class And(val queryA: Query, val queryB: Query) : Query
 
-    class Or(val queryA: Query, val queryB: Query) : Query(
-        "(${queryA.selection} OR ${queryB.selection})",
-        queryA.selectionArgs + queryB.selectionArgs
-    )
+    class Or(val queryA: Query, val queryB: Query) : Query
 }
+
+data class QuerySelectionAndArgs(
+    val selection: String,
+    val selectionArgs: Array<String>
+)

entities/src/main/java/org/odk/collect/entities/javarosa/parse/EntityItemElement.kt

@@ -1,6 +1,6 @@
 package org.odk.collect.entities.javarosa.parse
 
-internal object EntityItemElement {
+object EntityItemElement {
     const val ID = "name"
     const val LABEL = "label"
     const val VERSION = "__version"