From 69fba1452d5bcbc80a8dc42ed2639af6ee0efba4 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Sat, 5 Feb 2022 02:15:04 +0100 Subject: [PATCH] Update: Complete the return data in the product query --- src/main/kotlin/com/looker/droidify/Common.kt | 5 +++-- src/main/kotlin/com/looker/droidify/database/DAOs.kt | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/com/looker/droidify/Common.kt b/src/main/kotlin/com/looker/droidify/Common.kt index 5cf18363..c1fa4cd6 100644 --- a/src/main/kotlin/com/looker/droidify/Common.kt +++ b/src/main/kotlin/com/looker/droidify/Common.kt @@ -20,8 +20,9 @@ const val ROW_UPDATED = "updated" const val ROW_VERSION_CODE = "version_code" const val ROW_SIGNATURES = "signatures" const val ROW_COMPATIBLE = "compatible" -const val ROW_DATA = "data" -const val ROW_DATA_ITEM = "data_item" // TODO remove when time comes +const val ROW_ICON = "icon" +const val ROW_METADATA_ICON = "metadataIcon" +const val ROW_RELEASES = "releases" const val ROW_VERSION = "version" const val ROW_SIGNATURE = "signature" const val ROW_ID = "_id" diff --git a/src/main/kotlin/com/looker/droidify/database/DAOs.kt b/src/main/kotlin/com/looker/droidify/database/DAOs.kt index 6f4c542e..5d5811f1 100644 --- a/src/main/kotlin/com/looker/droidify/database/DAOs.kt +++ b/src/main/kotlin/com/looker/droidify/database/DAOs.kt @@ -121,7 +121,8 @@ interface ProductDao : BaseDao { (COALESCE(lock.${ROW_VERSION_CODE}, -1) NOT IN (0, product.${ROW_VERSION_CODE}) AND product.${ROW_COMPATIBLE} != 0 AND product.${ROW_VERSION_CODE} > COALESCE(installed.${ROW_VERSION_CODE}, 0xffffffff) AND $signatureMatches) - AS ${ROW_CAN_UPDATE}, product.${ROW_COMPATIBLE},""" + AS ${ROW_CAN_UPDATE}, product.${ROW_COMPATIBLE}, + product.${ROW_ICON}, product.${ROW_METADATA_ICON}, product.${ROW_RELEASES},""" if (searchQuery.isNotEmpty()) { builder += """(((product.${ROW_NAME} LIKE ? OR