evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix sql integration issues 5.0 beta (#71063)

Browse source 
Co-authored-by: Paulus Schoutsen <balloob@gmail.com>
This commit is contained in:
G Johansson 2022-04-29 19:00:44 +02:00 • committed by GitHub
parent 755020ff63
commit c90eb4d6b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 48 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

30
homeassistant/components/sql/config_flow.py
View file

@ -23,17 +23,12 @@ _LOGGER = logging.getLogger(__name__)
DATA_SCHEMA = vol.Schema(
{
vol.Optional(CONF_DB_URL): selector.TextSelector(selector.TextSelectorConfig()),
vol.Required(CONF_COLUMN_NAME): selector.TextSelector(
selector.TextSelectorConfig()
),
vol.Required(CONF_QUERY): selector.TextSelector(selector.TextSelectorConfig()),
vol.Optional(CONF_UNIT_OF_MEASUREMENT): selector.TextSelector(
selector.TextSelectorConfig()
),
vol.Optional(CONF_VALUE_TEMPLATE): selector.TemplateSelector(
selector.TemplateSelectorConfig()
),
vol.Required(CONF_NAME, default="Select SQL Query"): selector.TextSelector(),
vol.Optional(CONF_DB_URL): selector.TextSelector(),
vol.Required(CONF_COLUMN_NAME): selector.TextSelector(),
vol.Required(CONF_QUERY): selector.TextSelector(),
vol.Optional(CONF_UNIT_OF_MEASUREMENT): selector.TextSelector(),
vol.Optional(CONF_VALUE_TEMPLATE): selector.TemplateSelector(),
}
)
@ -109,8 +104,7 @@ class SQLConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
column = user_input[CONF_COLUMN_NAME]
uom = user_input.get(CONF_UNIT_OF_MEASUREMENT)
value_template = user_input.get(CONF_VALUE_TEMPLATE)
name = f"Select {column} SQL query"
name = user_input[CONF_NAME]
try:
validate_sql_select(query)
@ -182,17 +176,17 @@ class SQLOptionsFlowHandler(config_entries.OptionsFlow):
description={
"suggested_value": self.entry.options[CONF_DB_URL]
},
): selector.selector({"text": {}}),
): selector.TextSelector(),
vol.Required(
CONF_QUERY,
description={"suggested_value": self.entry.options[CONF_QUERY]},
): selector.selector({"text": {}}),
): selector.TextSelector(),
vol.Required(
CONF_COLUMN_NAME,
description={
"suggested_value": self.entry.options[CONF_COLUMN_NAME]
},
): selector.selector({"text": {}}),
): selector.TextSelector(),
vol.Optional(
CONF_UNIT_OF_MEASUREMENT,
description={
@ -200,7 +194,7 @@ class SQLOptionsFlowHandler(config_entries.OptionsFlow):
CONF_UNIT_OF_MEASUREMENT
)
},
): selector.selector({"text": {}}),
): selector.TextSelector(),
vol.Optional(
CONF_VALUE_TEMPLATE,
description={
@ -208,7 +202,7 @@ class SQLOptionsFlowHandler(config_entries.OptionsFlow):
CONF_VALUE_TEMPLATE
)
},
): selector.selector({"text": {}}),
): selector.TemplateSelector(),
}
),
errors=errors,