Fixed mapping collumn names

Author: grzesiek2010

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

@@ -19,6 +19,7 @@ import org.odk.collect.db.sqlite.SQLiteDatabaseExt.doesColumnExist
 import org.odk.collect.db.sqlite.SQLiteDatabaseExt.getColumnNames
 import org.odk.collect.db.sqlite.SQLiteDatabaseExt.query
 import org.odk.collect.db.sqlite.SynchronizedDatabaseConnection
+import org.odk.collect.entities.javarosa.parse.EntityItemElement
 import org.odk.collect.entities.storage.EntitiesRepository
 import org.odk.collect.entities.storage.Entity
 
@@ -156,7 +157,7 @@ class DatabaseEntitiesRepository(context: Context, dbPath: String) : EntitiesRep
             return emptyList()
         }
 
-        return query(list, null)
+        return queryWithAttachedRowId(list, null)
     }
 
     override fun getCount(list: String): Int {
@@ -205,43 +206,24 @@ class DatabaseEntitiesRepository(context: Context, dbPath: String) : EntitiesRep
     }
 
     override fun query(list: String, query: Query?): List<Entity.Saved> {
-        return if (query == null) {
-            databaseConnection.withConnection {
-                readableDatabase
-                    .rawQuery(
-                        """
-                        SELECT *, i.$ROW_ID
-                        FROM "$list" e, "${getRowIdTableName(list)}" i
-                        WHERE e._id = i._id
-                        ORDER BY i.$ROW_ID
-                        """.trimIndent(),
-                        null
-                    )
-            }
-        } else {
-            databaseConnection.withConnection {
-                readableDatabase
-                    .rawQuery(
-                        """
-                        SELECT *, i.$ROW_ID
-                        FROM "$list" e, "${getRowIdTableName(list)}" i
-                        WHERE e._id = i._id AND ${query.selection}
-                        ORDER BY i.$ROW_ID
-                        """.trimIndent(),
-                        query.selectionArgs
-                    )
+        return queryWithAttachedRowId(list, query?.copyWithAdjustedColumns { columnName ->
+            when (columnName) {
+                EntityItemElement.ID -> EntitiesTable.COLUMN_ID
+                EntityItemElement.LABEL -> EntitiesTable.COLUMN_LABEL
+                EntityItemElement.VERSION -> EntitiesTable.COLUMN_VERSION
+                else -> {
+                    EntitiesTable.getPropertyColumn(columnName)
+                }
             }
-        }.foldAndClose {
-            mapCursorRowToEntity(it, it.getInt(ROW_ID))
-        }
+        })
     }
 
     override fun getById(list: String, id: String): Entity.Saved? {
         if (!listExists(list)) {
             return null
         }
 
-        return query(list, Query.Eq(EntitiesTable.COLUMN_ID, id)).firstOrNull()
+        return queryWithAttachedRowId(list, Query.Eq(EntitiesTable.COLUMN_ID, id)).firstOrNull()
     }
 
     override fun getAllByProperty(
@@ -258,12 +240,12 @@ class DatabaseEntitiesRepository(context: Context, dbPath: String) : EntitiesRep
         }
 
         return if (propertyExists) {
-            query(
+            queryWithAttachedRowId(
                 list,
                 Query.Eq(EntitiesTable.getPropertyColumn(property), value)
             )
         } else if (value == "") {
-            query(list, null)
+            queryWithAttachedRowId(list, null)
         } else {
             emptyList()
         }
@@ -274,7 +256,39 @@ class DatabaseEntitiesRepository(context: Context, dbPath: String) : EntitiesRep
             return null
         }
 
-        return query(list, Query.Eq("i.$ROW_ID", (index + 1).toString())).firstOrNull()
+        return queryWithAttachedRowId(list, Query.Eq("i.$ROW_ID", (index + 1).toString())).firstOrNull()
+    }
+
+    private fun queryWithAttachedRowId(list: String, query: Query?): List<Entity.Saved> {
+        return if (query == null) {
+            databaseConnection.withConnection {
+                readableDatabase
+                    .rawQuery(
+                        """
+                        SELECT *, i.$ROW_ID
+                        FROM "$list" e, "${getRowIdTableName(list)}" i
+                        WHERE e._id = i._id
+                        ORDER BY i.$ROW_ID
+                        """.trimIndent(),
+                        null
+                    )
+            }
+        } else {
+            databaseConnection.withConnection {
+                readableDatabase
+                    .rawQuery(
+                        """
+                        SELECT *, i.$ROW_ID
+                        FROM "$list" e, "${getRowIdTableName(list)}" i
+                        WHERE e._id = i._id AND ${query.selection}
+                        ORDER BY i.$ROW_ID
+                        """.trimIndent(),
+                        query.selectionArgs
+                    )
+            }
+        }.foldAndClose {
+            mapCursorRowToEntity(it, it.getInt(ROW_ID))
+        }
     }
 
     /**

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

@@ -23,4 +23,19 @@ sealed class Query(
         "(${queryA.selection} OR ${queryB.selection})",
         queryA.selectionArgs + queryB.selectionArgs
     )
+
+    fun copyWithAdjustedColumns(columnMapper: (String) -> String): Query {
+        return when (this) {
+            is Eq -> Eq(columnMapper(column), value)
+            is NotEq -> NotEq(columnMapper(column), value)
+            is And -> And(
+                queryA.copyWithAdjustedColumns(columnMapper),
+                queryB.copyWithAdjustedColumns(columnMapper)
+            )
+            is Or -> Or(
+                queryA.copyWithAdjustedColumns(columnMapper),
+                queryB.copyWithAdjustedColumns(columnMapper)
+            )
+        }
+    }
 }

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"