Add test_sensor.test_multiple_sensors_using_same_external_db

Signed-off-by: David Rapan <[email protected]>

Author: davidrapan

homeassistant/components/sql/sensor.py

@@ -279,8 +279,10 @@ def _process(self, result: Result) -> None:
             _LOGGER.warning("%s returned no results", self._query)
 
     def _update(self) -> None:
-        """Retrieve sensor data from the query."""
-        self._attr_extra_state_attributes = {}
+        """Retrieve sensor data from the query.
+
+        This does I/O and should be run in the executor.
+        """
         if TYPE_CHECKING:
             assert isinstance(self.sessionmaker, scoped_session)
         with self.sessionmaker() as session:
@@ -296,8 +298,8 @@ def _update(self) -> None:
 
     async def async_update(self) -> None:
         """Retrieve sensor data from the query using the right executor."""
+        self._attr_extra_state_attributes = {}
         if isinstance(self.sessionmaker, async_scoped_session):
-            self._attr_extra_state_attributes = {}
             async with self.sessionmaker() as session:
                 try:
                     self._process(await session.execute(self._lambda_stmt))

homeassistant/components/sql/util.py

@@ -215,7 +215,9 @@ async def _async_validate_and_get_session_maker_for_db_url(
     """Validate the db_url and return a async session maker."""
     try:
         maker = async_scoped_session(
-            async_sessionmaker(bind=create_async_engine(db_url)),
+            async_sessionmaker(
+                bind=create_async_engine(db_url, future=True), future=True
+            ),
             scopefunc=asyncio.current_task,
         )
         # Run a dummy query just to test the db_url

tests/components/sql/test_sensor.py

@@ -638,6 +638,53 @@ async def test_multiple_sensors_using_same_db(
         await hass.async_stop()
 
 
+async def test_multiple_sensors_using_same_external_db(
+    recorder_mock: Recorder, hass: HomeAssistant, tmp_path: Path
+) -> None:
+    """Test multiple sensors using the same external db."""
+    db_path = tmp_path / "test.db"
+
+    # Create and populate the external database
+    conn = sqlite3.connect(db_path)
+    conn.execute("CREATE TABLE users (name TEXT, age INTEGER)")
+    conn.execute("INSERT INTO users (name, age) VALUES ('Alice', 30), ('Bob', 25)")
+    conn.commit()
+    conn.close()
+
+    config = {CONF_DB_URL: f"sqlite:///{db_path}"}
+    config2 = {CONF_DB_URL: f"sqlite:///{db_path}"}
+    options = {
+        CONF_QUERY: "SELECT name FROM users ORDER BY age LIMIT 1",
+        CONF_COLUMN_NAME: "name",
+    }
+    options2 = {
+        CONF_QUERY: "SELECT name FROM users ORDER BY age DESC LIMIT 1",
+        CONF_COLUMN_NAME: "name",
+    }
+
+    await init_integration(
+        hass, title="Select name SQL query", config=config, options=options
+    )
+
+    assert hass.data["sql"]
+    assert len(hass.data["sql"].session_makers_by_db_url) == 1
+    assert hass.states.get("sensor.select_name_sql_query").state == "Bob"
+
+    await init_integration(
+        hass,
+        title="Select name SQL query 2",
+        config=config2,
+        options=options2,
+        entry_id="2",
+    )
+
+    assert len(hass.data["sql"].session_makers_by_db_url) == 1
+    assert hass.states.get("sensor.select_name_sql_query_2").state == "Alice"
+
+    with patch("sqlalchemy.engine.base.Engine.dispose"):
+        await hass.async_stop()
+
+
 async def test_engine_is_disposed_at_stop(
     recorder_mock: Recorder, hass: HomeAssistant
 ) -> None: