evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update logbook queries for SADeprecationWarning (#87108)

Browse source
This commit is contained in:
J. Nick Koston 2023-03-09 02:03:08 -10:00 • committed by GitHub
parent c2f69dc59d
commit 86ad8261d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
homeassistant/components/logbook/queries/devices.py
View file

@ -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)

2
homeassistant/components/logbook/queries/entities.py
View file

@ -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)

2
homeassistant/components/logbook/queries/entities_and_devices.py
View file

@ -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)