Add and restore context in recorder (#15859)
This commit is contained in:
1 parent
da916d7b27
commit
9512bb9587
7 files changed
+73
-14
No files matched your search
@@ -114,6 +114,27 @@ def _drop_index(engine, table_name, index_name):
|
||||
"critical operation.", index_name, table_name)
|
||||
|
||||
|
||||
def _add_columns(engine, table_name, columns_def):
|
||||
"""Add columns to a table."""
|
||||
from sqlalchemy import text
|
||||
from sqlalchemy.exc import SQLAlchemyError
|
||||
|
||||
columns_def = ['ADD COLUMN {}'.format(col_def) for col_def in columns_def]
|
||||
|
||||
try:
|
||||
engine.execute(text("ALTER TABLE {table} {columns_def}".format(
|
||||
table=table_name,
|
||||
columns_def=', '.join(columns_def))))
|
||||
return
|
||||
except SQLAlchemyError:
|
||||
pass
|
||||
|
||||
for column_def in columns_def:
|
||||
engine.execute(text("ALTER TABLE {table} {column_def}".format(
|
||||
table=table_name,
|
||||
column_def=column_def)))
|
||||
|
||||
|
||||
def _apply_update(engine, new_version, old_version):
|
||||
"""Perform operations to bring schema up to date."""
|
||||
if new_version == 1:
|
||||
@@ -146,6 +167,19 @@ def _apply_update(engine, new_version, old_version):
|
||||
elif new_version == 5:
|
||||
# Create supporting index for States.event_id foreign key
|
||||
_create_index(engine, "states", "ix_states_event_id")
|
||||
elif new_version == 6:
|
||||
_add_columns(engine, "events", [
|
||||
'context_id CHARACTER(36)',
|
||||
'context_user_id CHARACTER(36)',
|
||||
])
|
||||
_create_index(engine, "events", "ix_events_context_id")
|
||||
_create_index(engine, "events", "ix_events_context_user_id")
|
||||
_add_columns(engine, "states", [
|
||||
'context_id CHARACTER(36)',
|
||||
'context_user_id CHARACTER(36)',
|
||||
])
|
||||
_create_index(engine, "states", "ix_states_context_id")
|
||||
_create_index(engine, "states", "ix_states_context_user_id")
|
||||
else:
|
||||
raise ValueError("No schema migration defined for version {}"
|
||||
.format(new_version))
|
||||
|
||||
@@ -9,14 +9,15 @@ from sqlalchemy import (
|
||||
from sqlalchemy.ext.declarative import declarative_base
|
||||
|
||||
import homeassistant.util.dt as dt_util
|
||||
from homeassistant.core import Event, EventOrigin, State, split_entity_id
|
||||
from homeassistant.core import (
|
||||
Context, Event, EventOrigin, State, split_entity_id)
|
||||
from homeassistant.remote import JSONEncoder
|
||||
|
||||
# SQLAlchemy Schema
|
||||
# pylint: disable=invalid-name
|
||||
Base = declarative_base()
|
||||
|
||||
SCHEMA_VERSION = 5
|
||||
SCHEMA_VERSION = 6
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
@@ -31,6 +32,8 @@ class Events(Base): # type: ignore
|
||||
origin = Column(String(32))
|
||||
time_fired = Column(DateTime(timezone=True), index=True)
|
||||
created = Column(DateTime(timezone=True), default=datetime.utcnow)
|
||||
context_id = Column(String(36), index=True)
|
||||
context_user_id = Column(String(36), index=True)
|
||||
|
||||
@staticmethod
|
||||
def from_event(event):
|
||||
@@ -38,16 +41,23 @@ class Events(Base): # type: ignore
|
||||
return Events(event_type=event.event_type,
|
||||
event_data=json.dumps(event.data, cls=JSONEncoder),
|
||||
origin=str(event.origin),
|
||||
time_fired=event.time_fired)
|
||||
time_fired=event.time_fired,
|
||||
context_id=event.context.id,
|
||||
context_user_id=event.context.user_id)
|
||||
|
||||
def to_native(self):
|
||||
"""Convert to a natve HA Event."""
|
||||
context = Context(
|
||||
id=self.context_id,
|
||||
user_id=self.context_user_id
|
||||
)
|
||||
try:
|
||||
return Event(
|
||||
self.event_type,
|
||||
json.loads(self.event_data),
|
||||
EventOrigin(self.origin),
|
||||
_process_timestamp(self.time_fired)
|
||||
_process_timestamp(self.time_fired),
|
||||
context=context,
|
||||
)
|
||||
except ValueError:
|
||||
# When json.loads fails
|
||||
@@ -69,6 +79,8 @@ class States(Base): # type: ignore
|
||||
last_updated = Column(DateTime(timezone=True), default=datetime.utcnow,
|
||||
index=True)
|
||||
created = Column(DateTime(timezone=True), default=datetime.utcnow)
|
||||
context_id = Column(String(36), index=True)
|
||||
context_user_id = Column(String(36), index=True)
|
||||
|
||||
__table_args__ = (
|
||||
# Used for fetching the state of entities at a specific time
|
||||
@@ -82,7 +94,11 @@ class States(Base): # type: ignore
|
||||
entity_id = event.data['entity_id']
|
||||
state = event.data.get('new_state')
|
||||
|
||||
dbstate = States(entity_id=entity_id)
|
||||
dbstate = States(
|
||||
entity_id=entity_id,
|
||||
context_id=event.context.id,
|
||||
context_user_id=event.context.user_id,
|
||||
)
|
||||
|
||||
# State got deleted
|
||||
if state is None:
|
||||
@@ -103,12 +119,17 @@ class States(Base): # type: ignore
|
||||
|
||||
def to_native(self):
|
||||
"""Convert to an HA state object."""
|
||||
context = Context(
|
||||
id=self.context_id,
|
||||
user_id=self.context_user_id
|
||||
)
|
||||
try:
|
||||
return State(
|
||||
self.entity_id, self.state,
|
||||
json.loads(self.attributes),
|
||||
_process_timestamp(self.last_changed),
|
||||
_process_timestamp(self.last_updated)
|
||||
_process_timestamp(self.last_updated),
|
||||
context=context,
|
||||
)
|
||||
except ValueError:
|
||||
# When json.loads fails
|
||||
|
||||
Reference in new issue
Block a user