Scott.Idem/OSIT-AE-API-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

General code clean up. More work on event tracking related

Browse Source
This commit is contained in:
Scott Idem
2022-02-15 16:05:29 -05:00
parent 003ffb4adf
commit df6e860620
8 changed files with 208 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/db_sql.py
View File

@@ -39,7 +39,7 @@ def sql_insert(
rm_id_random: bool = False,
id_random_length: int = 8,
log_lvl: int = logging.WARNING, # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
):
) -> None|bool|int:
log.setLevel(log_lvl)
if sql:
@@ -623,10 +623,10 @@ def sql_select(
log.debug('Successfully executed the SQL on the first try.')
pass
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(f'Row count: {result.rowcount}')
#log.debug(vars(result))
#log.debug(dir(result))
# log.debug(vars(result))
# log.debug(dir(result))
# NOTE: as_dict defaults to True for this function
# NOTE: as_list defaults to False for this function
@@ -679,7 +679,7 @@ def sql_select(
# ### BEGIN ### Core Help CRUD ### sql_delete() ###
# The catch all SQL DELETE function - STI 2021-02-17
# This one does it all for SQL DELETE queries
# Updated 2021-09-07
# Updated 2022-02-15
@logger_reset
def sql_delete(
table_name: str|None = None,
@@ -689,8 +689,8 @@ def sql_delete(
field_value = None,
sql: str|None = None,
data: dict|None = None,
log_lvl: int = logging.WARNING, # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
):
log_lvl: int = logging.DEBUG, # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
) -> None|bool:
log.setLevel(log_lvl)
if table_name and (record_id or record_id_random) and not (field_name or field_value or sql or data):
@@ -762,7 +762,7 @@ def sql_delete(
# return False
try:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
if data:
log.info('Executing with SQL (DELETE) statement and data...')
result = db.execute(sql, data)
@@ -791,7 +791,7 @@ def sql_delete(
db.engine.dispose()
log.info('Now trying the query again...')
try:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
if data:
log.info('2x Executing with SQL statement and data...')
result = db.execute(sql, data)
@@ -826,8 +826,20 @@ def sql_delete(
log.info('Successfully executed the SQL on the first try.')
pass
# NOTE: Need to deal with 0 rows affected when the WHERE clause was not satisfied and there was no error.
return True # Successful
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(f'Row count: {result.rowcount}')
# log.debug(vars(result))
# log.debug(dir(result))
if result.rowcount == 1:
log.info(f'Deleted one record. Returning True.')
return True # Successful
elif result.rowcount > 1:
log.info(f'Deleted {result.rowcount} records. Returning True.')
return True # Successful
else:
log.info('No records deleted. Returning None.')
return None # Successful even though no results
# ### END ### Core Help CRUD ### sql_delete() ###