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

Convert decimals from SQL results (#13059)

Browse Source
This commit is contained in:
Paulus Schoutsen 2018-03-10 10:40:28 -08:00
parent b98d2e2485
commit 42359b3b48
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
homeassistant/components/sensor/sql.py
View File

@ -4,6 +4,7 @@ Sensor from an SQL Query.
For more details about this platform, please refer to the documentation at For more details about this platform, please refer to the documentation at
https://home-assistant.io/components/sensor.sql/ https://home-assistant.io/components/sensor.sql/
""" """
import decimal
import logging import logging
import voluptuous as vol import voluptuous as vol
@ -131,17 +132,20 @@ class SQLSensor(Entity):
try: try:
sess = self.sessionmaker() sess = self.sessionmaker()
result = sess.execute(self._query) result = sess.execute(self._query)
self._attributes = {}
if not result.returns_rows or result.rowcount == 0: if not result.returns_rows or result.rowcount == 0:
_LOGGER.warning("%s returned no results", self._query) _LOGGER.warning("%s returned no results", self._query)
self._state = None self._state = None
self._attributes = {}
return return
for res in result: for res in result:
_LOGGER.debug("result = %s", res.items()) _LOGGER.debug("result = %s", res.items())
data = res[self._column_name] data = res[self._column_name]
self._attributes = {k: v for k, v in res.items()} for key, value in res.items():
if isinstance(value, decimal.Decimal):
value = float(decimal)
self._attributes[key] = value
except sqlalchemy.exc.SQLAlchemyError as err: except sqlalchemy.exc.SQLAlchemyError as err:
_LOGGER.error("Error executing query %s: %s", self._query, err) _LOGGER.error("Error executing query %s: %s", self._query, err)
return return

5
tests/components/sensor/test_sql.py
View File

@ -29,7 +29,7 @@ class TestSQLSensor(unittest.TestCase):
'db_url': 'sqlite://', 'db_url': 'sqlite://',
'queries': [{ 'queries': [{
'name': 'count_tables', 'name': 'count_tables',
'query': 'SELECT count(*) value FROM sqlite_master;', 'query': 'SELECT 5 as value',
'column': 'value', 'column': 'value',
}] }]
} }
@ -38,7 +38,8 @@ class TestSQLSensor(unittest.TestCase):
assert setup_component(self.hass, 'sensor', config) assert setup_component(self.hass, 'sensor', config)
state = self.hass.states.get('sensor.count_tables') state = self.hass.states.get('sensor.count_tables')
self.assertEqual(state.state, '0') assert state.state == '5'
assert state.attributes['value'] == 5
def test_invalid_query(self): def test_invalid_query(self):
"""Test the SQL sensor for invalid queries.""" """Test the SQL sensor for invalid queries."""