fix refactor

This commit is contained in:
J. Nick Koston
2023-04-10 12:14:42 -10:00
parent c77e55557a
commit 00c5d497fb
2 changed files with 10 additions and 5 deletions

View File

@@ -494,7 +494,7 @@ def get_last_state_changes(
) )
def _get_states_for_entities_stmt( def _get_start_time_state_for_entities_stmt(
run_start_ts: float, run_start_ts: float,
epoch_time: float, epoch_time: float,
metadata_ids: list[int], metadata_ids: list[int],
@@ -567,7 +567,7 @@ def _get_start_time_state_stmt(
) )
# We have more than one entity to look at so we need to do a query on states # We have more than one entity to look at so we need to do a query on states
# since the last recorder run started. # since the last recorder run started.
return _get_states_for_entities_stmt( return _get_start_time_state_for_entities_stmt(
run_start_ts, epoch_time, metadata_ids, no_attributes run_start_ts, epoch_time, metadata_ids, no_attributes
) )

View File

@@ -8,7 +8,7 @@ from unittest.mock import MagicMock, Mock, patch
import py import py
import pytest import pytest
from sqlalchemy import text from sqlalchemy import lambda_stmt, text
from sqlalchemy.engine.result import ChunkedIteratorResult from sqlalchemy.engine.result import ChunkedIteratorResult
from sqlalchemy.exc import SQLAlchemyError from sqlalchemy.exc import SQLAlchemyError
from sqlalchemy.sql.elements import TextClause from sqlalchemy.sql.elements import TextClause
@@ -19,7 +19,7 @@ from homeassistant.components.recorder import util
from homeassistant.components.recorder.const import DOMAIN, SQLITE_URL_PREFIX from homeassistant.components.recorder.const import DOMAIN, SQLITE_URL_PREFIX
from homeassistant.components.recorder.db_schema import RecorderRuns from homeassistant.components.recorder.db_schema import RecorderRuns
from homeassistant.components.recorder.history.modern import ( from homeassistant.components.recorder.history.modern import (
_get_single_entity_states_stmt, _get_single_entity_start_time_stmt,
) )
from homeassistant.components.recorder.models import ( from homeassistant.components.recorder.models import (
UnsupportedDialect, UnsupportedDialect,
@@ -909,7 +909,12 @@ def test_execute_stmt_lambda_element(
with session_scope(hass=hass) as session: with session_scope(hass=hass) as session:
# No time window, we always get a list # No time window, we always get a list
metadata_id = instance.states_meta_manager.get("sensor.on", session, True) metadata_id = instance.states_meta_manager.get("sensor.on", session, True)
stmt = _get_single_entity_states_stmt(dt_util.utcnow(), metadata_id, False) start_time_ts = dt_util.utcnow().timestamp()
stmt = lambda_stmt(
lambda: _get_single_entity_start_time_stmt(
start_time_ts, metadata_id, False
)
)
rows = util.execute_stmt_lambda_element(session, stmt) rows = util.execute_stmt_lambda_element(session, stmt)
assert isinstance(rows, list) assert isinstance(rows, list)
assert rows[0].state == new_state.state assert rows[0].state == new_state.state