home-assistant/core
1
0
Fork 1
mirror of https://github.com/home-assistant/core.git synced 2025-08-08 15:15:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
J. Nick Koston
2023-03-10 10:05:51 -10:00
parent aaf1103652
commit 7161b15c91
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/recorder/migration.py
View File

@@ -1315,6 +1315,8 @@ def migrate_event_type_ids(instance: Recorder) -> bool:
session.add_all(missing_db_event_types) session.add_all(missing_db_event_types)
session.flush() # Assign ids session.flush() # Assign ids
for db_event_type in missing_db_event_types: for db_event_type in missing_db_event_types:
# We cannot add the assigned ids to the event_type_manager
# because the commit could get rolled back
assert db_event_type.event_type is not None assert db_event_type.event_type is not None
event_type_to_id[ event_type_to_id[
db_event_type.event_type db_event_type.event_type

3
homeassistant/components/recorder/purge.py
View File

@@ -112,7 +112,8 @@ def purge_old_data(
return False return False
_purge_old_recorder_runs(instance, session, purge_before) _purge_old_recorder_runs(instance, session, purge_before)
_purge_old_event_types(instance, session) if instance.event_type_manager.active:
_purge_old_event_types(instance, session)
if repack: if repack:
repack_database(instance) repack_database(instance)
return True return True

24
homeassistant/components/recorder/table_managers/event_types.py
View File

@@ -42,21 +42,21 @@ class EventTypeManager:
results: dict[str, int | None] = {} results: dict[str, int | None] = {}
missing: list[str] = [] missing: list[str] = []
for event_type in event_types: for event_type in event_types:
if event_type_id := self._id_map.get(event_type): if (event_type_id := self._id_map.get(event_type)) is None:
results[event_type] = event_type_id
else:
missing.append(event_type) missing.append(event_type)
for event_type in missing: results[event_type] = event_type_id
with session.no_autoflush:
if event_type_row := session.execute(
find_event_type_ids(missing)
).first():
event_type_id = cast(int, event_type_row[0])
results[event_type] = self._id_map[event_type] = event_type_id
continue
results[event_type] = None if not missing:
return results
with session.no_autoflush:
for event_type_id, event_type in session.execute(
find_event_type_ids(missing)
):
results[event_type] = self._id_map[event_type] = cast(
int, event_type_id
)
return results return results