Bug fix for sql_select with enabled or hidden passed.
This commit is contained in:
@@ -529,8 +529,8 @@ def sql_select(
|
|||||||
record_id_random: str|None = None,
|
record_id_random: str|None = None,
|
||||||
field_name: str|None = None,
|
field_name: str|None = None,
|
||||||
field_value = None,
|
field_value = None,
|
||||||
enabled: str = 'enabled', # enabled, disabled, all
|
enabled: str|None = None, # enabled, disabled, all
|
||||||
hidden: str = 'not_hidden', # hidden, not_hidden, all
|
hidden: str|None = None, # hidden, not_hidden, all
|
||||||
limit: int = 9999999,
|
limit: int = 9999999,
|
||||||
offset: int = 0,
|
offset: int = 0,
|
||||||
sql: str|None = None,
|
sql: str|None = None,
|
||||||
@@ -549,6 +549,16 @@ def sql_select(
|
|||||||
else:
|
else:
|
||||||
sql_limit_offset = ''
|
sql_limit_offset = ''
|
||||||
|
|
||||||
|
# if enabled:
|
||||||
|
# sql_enabled = sql_enable_part(table_name=table_name, enabled=enabled) # Reasonably safe return str
|
||||||
|
# else:
|
||||||
|
# sql_enabled = ''
|
||||||
|
|
||||||
|
# if hidden:
|
||||||
|
# sql_hidden = sql_hidden_part(table_name=table_name, hidden=hidden) # Reasonably safe return str
|
||||||
|
# else:
|
||||||
|
# sql_hidden = ''
|
||||||
|
|
||||||
if table_name and not (record_id or record_id_random or field_name or field_value or sql or data):
|
if table_name and not (record_id or record_id_random or field_name or field_value or sql or data):
|
||||||
# Select all records from a table
|
# Select all records from a table
|
||||||
# Updated 2023-07-06
|
# Updated 2023-07-06
|
||||||
@@ -557,9 +567,24 @@ def sql_select(
|
|||||||
# NOTE: This is new and currently only working with the API CRUD list endpoint and the sql_select function calls. -2023-07-06
|
# NOTE: This is new and currently only working with the API CRUD list endpoint and the sql_select function calls. -2023-07-06
|
||||||
# NOTE: This call (without field_name, field_value) may need more testing.
|
# NOTE: This call (without field_name, field_value) may need more testing.
|
||||||
data = {}
|
data = {}
|
||||||
sql_enabled, data['enable'] = sql_enable_part(table_name=table_name, enabled=enabled) # Reasonably safe return str and bool
|
|
||||||
|
|
||||||
sql_hidden, data['hidden'] = sql_hidden_part(table_name=table_name, hidden=hidden) # Reasonably safe return str and bool
|
if enabled:
|
||||||
|
sql_enabled, data['enabled'] = sql_enable_part(table_name=table_name, enabled=enabled) # Reasonably safe return str
|
||||||
|
else:
|
||||||
|
sql_enabled = ''
|
||||||
|
# data['enabled'] = ''
|
||||||
|
|
||||||
|
if hidden:
|
||||||
|
sql_hidden, data['hidden'] = sql_hidden_part(table_name=table_name, hidden=hidden) # Reasonably safe return str
|
||||||
|
else:
|
||||||
|
sql_hidden = ''
|
||||||
|
# data['hidden'] = ''
|
||||||
|
# if sql_enabled:
|
||||||
|
# data['enable'] = sql_enable_part(table_name=table_name, enabled=enabled) # Reasonably safe return str and bool
|
||||||
|
|
||||||
|
# if sql_hidden:
|
||||||
|
# sql_hidden = sql_hidden_part(table_name=table_name, hidden=hidden) # Reasonably safe return str and bool
|
||||||
|
# sql_hidden, data['hidden'] = sql_hidden_part(table_name=table_name, hidden=hidden) # Reasonably safe return str and bool
|
||||||
|
|
||||||
sql = text(
|
sql = text(
|
||||||
f"""
|
f"""
|
||||||
@@ -607,9 +632,27 @@ def sql_select(
|
|||||||
data = {}
|
data = {}
|
||||||
data[field_name] = field_value
|
data[field_name] = field_value
|
||||||
|
|
||||||
sql_enabled, data['enable'] = sql_enable_part(table_name=table_name, enabled=enabled) # Reasonably safe return str and bool
|
if enabled:
|
||||||
|
sql_enabled, data['enabled'] = sql_enable_part(table_name=table_name, enabled=enabled) # Reasonably safe return str
|
||||||
|
else:
|
||||||
|
sql_enabled = ''
|
||||||
|
# data['enabled'] = ''
|
||||||
|
|
||||||
sql_hidden, data['hidden'] = sql_hidden_part(table_name=table_name, hidden=hidden) # Reasonably safe return str and bool
|
if hidden:
|
||||||
|
sql_hidden, data['hidden'] = sql_hidden_part(table_name=table_name, hidden=hidden) # Reasonably safe return str
|
||||||
|
else:
|
||||||
|
sql_hidden = ''
|
||||||
|
# data['hidden'] = ''
|
||||||
|
|
||||||
|
# if sql_enabled:
|
||||||
|
# data['enable'] = sql_enable_part(table_name=table_name, enabled=enabled) # Reasonably safe return str and bool
|
||||||
|
|
||||||
|
# if sql_hidden:
|
||||||
|
# data['hidden'] = sql_hidden_part(table_name=table_name, hidden=hidden) # Reasonably safe return str and bool
|
||||||
|
|
||||||
|
# sql_enabled, data['enable'] = sql_enable_part(table_name=table_name, enabled=enabled) # Reasonably safe return str and bool
|
||||||
|
#
|
||||||
|
# sql_hidden, data['hidden'] = sql_hidden_part(table_name=table_name, hidden=hidden) # Reasonably safe return str and bool
|
||||||
|
|
||||||
sql = text(
|
sql = text(
|
||||||
f"""
|
f"""
|
||||||
|
|||||||
Reference in New Issue
Block a user