jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-25 14:17:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix repairing datetime precision for PostgreSQL (#83351)

Browse Source
This commit is contained in:
Erik Montnemery 2022-12-06 04:33:06 +01:00 committed by GitHub
parent 3ab9a14ce7
commit 587381440f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,7 +161,7 @@ def migrate_schema(
"Database is about to correct DB schema errors: %s", "Database is about to correct DB schema errors: %s",
", ".join(sorted(schema_errors)), ", ".join(sorted(schema_errors)),
) )
statistics_correct_db_schema(engine, session_maker, schema_errors) statistics_correct_db_schema(instance, engine, session_maker, schema_errors)
def _create_index( def _create_index(

13
homeassistant/components/recorder/statistics.py
View File

@ -2404,7 +2404,10 @@ def validate_db_schema(
def correct_db_schema( def correct_db_schema(
engine: Engine, session_maker: Callable[[], Session], schema_errors: set[str] instance: Recorder,
engine: Engine,
session_maker: Callable[[], Session],
schema_errors: set[str],
) -> None: ) -> None:
"""Correct issues detected by validate_db_schema.""" """Correct issues detected by validate_db_schema."""
from .migration import _modify_columns # pylint: disable=import-outside-toplevel from .migration import _modify_columns # pylint: disable=import-outside-toplevel
@ -2450,12 +2453,16 @@ def correct_db_schema(
) )
if f"{table.__tablename__}.µs precision" in schema_errors: if f"{table.__tablename__}.µs precision" in schema_errors:
# Attempt to convert datetime columns to µs precision # Attempt to convert datetime columns to µs precision
if instance.dialect_name == SupportedDialect.MYSQL:
datetime_type = "DATETIME(6)"
else:
datetime_type = "TIMESTAMP(6) WITH TIME ZONE"
_modify_columns( _modify_columns(
session_maker, session_maker,
engine, engine,
table.__tablename__, table.__tablename__,
[ [
"last_reset DATETIME(6)", f"last_reset {datetime_type}",
"start DATETIME(6)", f"start {datetime_type}",
], ],
) )

16
tests/components/recorder/test_statistics.py
View File

@ -1601,7 +1601,19 @@ async def test_validate_db_schema_fix_float_issue(
@pytest.mark.parametrize("enable_statistics_table_validation", [True]) @pytest.mark.parametrize("enable_statistics_table_validation", [True])
@pytest.mark.parametrize("db_engine", ("mysql", "postgresql")) @pytest.mark.parametrize(
"db_engine, modification",
(
("mysql", ["last_reset DATETIME(6)", "start DATETIME(6)"]),
(
"postgresql",
[
"last_reset TIMESTAMP(6) WITH TIME ZONE",
"start TIMESTAMP(6) WITH TIME ZONE",
],
),
),
)
@pytest.mark.parametrize( @pytest.mark.parametrize(
"table, replace_index", (("statistics", 0), ("statistics_short_term", 1)) "table, replace_index", (("statistics", 0), ("statistics_short_term", 1))
) )
@ -1617,6 +1629,7 @@ async def test_validate_db_schema_fix_statistics_datetime_issue(
hass, hass,
caplog, caplog,
db_engine, db_engine,
modification,
table, table,
replace_index, replace_index,
column, column,
@ -1664,7 +1677,6 @@ async def test_validate_db_schema_fix_statistics_datetime_issue(
f"Database is about to correct DB schema errors: {table}.µs precision" f"Database is about to correct DB schema errors: {table}.µs precision"
in caplog.text in caplog.text
) )
modification = ["last_reset DATETIME(6)", "start DATETIME(6)"]
modify_columns_mock.assert_called_once_with(ANY, ANY, table, modification) modify_columns_mock.assert_called_once_with(ANY, ANY, table, modification)