From 191f24b2b9c9ee4a23373ddbf48cd350eca50124 Mon Sep 17 00:00:00 2001 From: Anders Melchiorsen Date: Wed, 28 Feb 2018 03:04:55 +0100 Subject: [PATCH] Revert optimized logbook SQL (#12762) --- homeassistant/components/logbook.py | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/homeassistant/components/logbook.py b/homeassistant/components/logbook.py index 1fc6d1587fc..e6e447884cb 100644 --- a/homeassistant/components/logbook.py +++ b/homeassistant/components/logbook.py @@ -47,11 +47,6 @@ CONFIG_SCHEMA = vol.Schema({ }), }, extra=vol.ALLOW_EXTRA) -ALL_EVENT_TYPES = [ - EVENT_STATE_CHANGED, EVENT_LOGBOOK_ENTRY, - EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP -] - GROUP_BY_MINUTES = 15 CONTINUOUS_DOMAINS = ['proximity', 'sensor'] @@ -271,18 +266,15 @@ def humanify(events): def _get_events(hass, config, start_day, end_day): """Get events for a period of time.""" - from homeassistant.components.recorder.models import Events, States + from homeassistant.components.recorder.models import Events from homeassistant.components.recorder.util import ( execute, session_scope) with session_scope(hass=hass) as session: - query = session.query(Events).order_by(Events.time_fired) \ - .outerjoin(States, (Events.event_id == States.event_id)) \ - .filter(Events.event_type.in_(ALL_EVENT_TYPES)) \ - .filter((Events.time_fired > start_day) - & (Events.time_fired < end_day)) \ - .filter((States.last_updated == States.last_changed) - | (States.last_updated.is_(None))) + query = session.query(Events).order_by( + Events.time_fired).filter( + (Events.time_fired > start_day) & + (Events.time_fired < end_day)) events = execute(query) return humanify(_exclude_events(events, config))