From 86ad8261d8a0172dac92b6d76628752db271a744 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Thu, 9 Mar 2023 02:03:08 -1000 Subject: [PATCH] Update logbook queries for SADeprecationWarning (#87108) --- homeassistant/components/logbook/queries/devices.py | 6 ++++-- homeassistant/components/logbook/queries/entities.py | 2 +- .../components/logbook/queries/entities_and_devices.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/homeassistant/components/logbook/queries/devices.py b/homeassistant/components/logbook/queries/devices.py index 303313602df..d84a5343108 100644 --- a/homeassistant/components/logbook/queries/devices.py +++ b/homeassistant/components/logbook/queries/devices.py @@ -33,8 +33,10 @@ def _select_device_id_context_ids_sub_query( json_quotable_device_ids: list[str], ) -> Select: """Generate a subquery to find context ids for multiple devices.""" - inner = select_events_context_id_subquery(start_day, end_day, event_types).where( - apply_event_device_id_matchers(json_quotable_device_ids) + inner = ( + select_events_context_id_subquery(start_day, end_day, event_types) + .where(apply_event_device_id_matchers(json_quotable_device_ids)) + .subquery() ) return select(inner.c.context_id_bin).group_by(inner.c.context_id_bin) diff --git a/homeassistant/components/logbook/queries/entities.py b/homeassistant/components/logbook/queries/entities.py index 2c095d1b051..10ca6fad134 100644 --- a/homeassistant/components/logbook/queries/entities.py +++ b/homeassistant/components/logbook/queries/entities.py @@ -47,7 +47,7 @@ def _select_entities_context_ids_sub_query( (States.last_updated_ts > start_day) & (States.last_updated_ts < end_day) ) .where(States.entity_id.in_(entity_ids)), - ) + ).subquery() return select(union.c.context_id_bin).group_by(union.c.context_id_bin) diff --git a/homeassistant/components/logbook/queries/entities_and_devices.py b/homeassistant/components/logbook/queries/entities_and_devices.py index ec38dc7b6d8..b4a1c7bc9f8 100644 --- a/homeassistant/components/logbook/queries/entities_and_devices.py +++ b/homeassistant/components/logbook/queries/entities_and_devices.py @@ -46,7 +46,7 @@ def _select_entities_device_id_context_ids_sub_query( (States.last_updated_ts > start_day) & (States.last_updated_ts < end_day) ) .where(States.entity_id.in_(entity_ids)), - ) + ).subquery() return select(union.c.context_id_bin).group_by(union.c.context_id_bin)