Skip to content
Snippets Groups Projects
Commit f6d2cf25 authored by Sara Savanovic Djordjevic's avatar Sara Savanovic Djordjevic
Browse files

update: db query strings

parent 334a7e11
No related branches found
No related tags found
No related merge requests found
...@@ -10,21 +10,23 @@ def get_all_markers(self, cursor, valid : bool): ...@@ -10,21 +10,23 @@ def get_all_markers(self, cursor, valid : bool):
cursor.execute(''' cursor.execute('''
SELECT m.MeasurementID, m.SensorID, m.TimeMeasured, d.Latitude, d.Longitude, SELECT m.MeasurementID, m.SensorID, m.TimeMeasured, d.Latitude, d.Longitude,
d.IceTop, d.IceBottom, d.CalculatedThickness, d.Accuracy, s.SensorType, s.Active, d.IceTop, d.IceBottom, d.CalculatedThickness, d.Accuracy, s.SensorType, s.Active,
c.CornerID, c.CornerLatitude, c.CornerLongitude c.CornerID, c.CornerLatitude, c.CornerLongitude, b.Name
FROM Measurement m FROM Measurement m
INNER JOIN Sensor s ON m.SensorID = s.SensorID INNER JOIN Sensor s ON m.SensorID = s.SensorID
INNER JOIN Data d ON m.MeasurementID = d.MeasurementID INNER JOIN Data d ON m.MeasurementID = d.MeasurementID
INNER JOIN Corner c ON m.MeasurementID = c.MeasurementID INNER JOIN Corner c ON m.MeasurementID = c.MeasurementID
INNER JOIN BodyOfWater b ON m.WaterBodyName = b.Name
WHERE m.TimeMeasured > DATE_SUB(NOW(), INTERVAL 5 DAY); WHERE m.TimeMeasured > DATE_SUB(NOW(), INTERVAL 5 DAY);
''') ''')
else: # Fetch all markers else: # Fetch all markers
cursor.execute(''' cursor.execute('''
SELECT m.MeasurementID, m.SensorID, m.TimeMeasured, d.Latitude, d.Longitude, SELECT m.MeasurementID, m.SensorID, m.TimeMeasured, d.Latitude, d.Longitude,
d.IceTop, d.IceBottom, d.CalculatedThickness, d.Accuracy, s.SensorType, s.Active, d.IceTop, d.IceBottom, d.CalculatedThickness, d.Accuracy, s.SensorType, s.Active,
c.CornerID, c.CornerLatitude, c.CornerLongitude c.CornerID, c.CornerLatitude, c.CornerLongitude, b.Name
FROM Measurement m FROM Measurement m
INNER JOIN Sensor s ON m.SensorID = s.SensorID INNER JOIN Sensor s ON m.SensorID = s.SensorID
INNER JOIN Data d ON m.MeasurementID = d.MeasurementID INNER JOIN Data d ON m.MeasurementID = d.MeasurementID
INNER JOIN BodyOfWater b ON m.WaterBodyName = b.Name
INNER JOIN Corner c ON m.MeasurementID = c.MeasurementID INNER JOIN Corner c ON m.MeasurementID = c.MeasurementID
''') ''')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment