Refactor queries.py to improve query selection logic
This commit is contained in:
@@ -7,10 +7,10 @@ def get_query(node, dataType, MAC, questionID, replies):
|
|||||||
query = f"SELECT * FROM Measurement WHERE Type = '{dataType}'"
|
query = f"SELECT * FROM Measurement WHERE Type = '{dataType}'"
|
||||||
elif MAC:
|
elif MAC:
|
||||||
query = f"SELECT * FROM Node WHERE MAC = '{MAC}'"
|
query = f"SELECT * FROM Node WHERE MAC = '{MAC}'"
|
||||||
|
elif replies and questionID:
|
||||||
|
query = f"SELECT * FROM Reply WHERE QuestionID = '{questionID}'"
|
||||||
elif questionID:
|
elif questionID:
|
||||||
query = f"SELECT * FROM Question"
|
query = f"SELECT * FROM Question"
|
||||||
elif replies:
|
|
||||||
query = f"SELECT * FROM Reply WHERE QuestionID = '{questionID}'"
|
|
||||||
else:
|
else:
|
||||||
query = "SELECT * FROM `Measurement`"
|
query = "SELECT * FROM `Measurement`"
|
||||||
return query
|
return query
|
||||||
|
Reference in New Issue
Block a user