android - How to observe ordering changes to observable query using Room and Compose? - Stack Overflow

I am using an observable query to observe changes to an Android Room database and display the results in a LazyColumn. This works fine but now I want the user to be able to change the sort order. With my current implementation, changing the sort order does not cause the LazyColumn to recompose. If another part of the state changes, the LazyColumn will recompose and the updated ordering will then be reflected in the view.

My DAO looks like this:

@Dao
interface EntityDao {
    @Query("SELECT * FROM entity" +
            " ORDER BY  " +
            "      CASE :sort WHEN 'Newest' THEN created END DESC," +
            "      CASE :sort WHEN 'Oldest' THEN created END ASC")
    fun all(sort: String): Flow<List<Entity>>
}

My view model looks like this:

class EntityViewModel(application: Application) : AndroidViewModel(application) {
    private val entityDao = AppDatabase.getDatabase(context = application.baseContext).entityDao()
    var entities: Flow<List<Entity>> = entityDao.all()

    private val _selectedSortMode = MutableStateFlow(EntitySortMode.NEWEST)
    val selectedSortMode = _selectedSortMode.asStateFlow()

    private fun updateDatabaseQuery() {
        val sort = _selectedSortMode.value.string
        entities = entityDao.all(sort)
    }

    fun changeSorting(newSortMode: EntitySortMode) {
        _selectedSortMode.value = newSortMode
        updateDatabaseQuery()
    }
}

And my composable is as follows:

@Composable
fun EntityView(viewModel: EntityViewModel) {
    val entities by viewModel.entities.collectAsStateWithLifecycle(initialValue = emptyList())

    LazyColumn {
        items(
            entities,
            key = {
                it.primaryKey
            }
        ) { entity ->
            Box(
                modifier = Modifier
                    .animateItem()
                    .clickable {}
             ) {
                 RowItem(entity)
            }
         }
    }
}

I've simplified the code to the relevant parts. Retrieving and displaying data from the database works correctly, the problem is that changing the sort ordering (calling changeSorting) does not result in the LazyColumn being recomposed. The items in the list are the same, but the order is different, and that seems to prevent recomposition from occurring.