From 70d1e733f6be4bcee90372e8cf3649c7a85cd95c Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Wed, 5 Apr 2023 22:34:13 -1000 Subject: [PATCH] Fix entity_id migration query failing with MySQL 8.0.30 (#90895) --- homeassistant/components/recorder/queries.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/recorder/queries.py b/homeassistant/components/recorder/queries.py index f983224e212..454c71f6dc5 100644 --- a/homeassistant/components/recorder/queries.py +++ b/homeassistant/components/recorder/queries.py @@ -730,7 +730,8 @@ def batch_cleanup_entity_ids() -> StatementLambdaElement: lambda: update(States) .where( States.state_id.in_( - select(States.state_id).join( + select(States.state_id) + .join( states_with_entity_ids := select( States.state_id.label("state_id_with_entity_id") ) @@ -739,6 +740,8 @@ def batch_cleanup_entity_ids() -> StatementLambdaElement: .subquery(), States.state_id == states_with_entity_ids.c.state_id_with_entity_id, ) + .alias("states_with_entity_ids") + .select() ) ) .values(entity_id=None)