diff --git a/main.py b/main.py index 95d63b7..40e9842 100644 --- a/main.py +++ b/main.py @@ -100,15 +100,20 @@ async def get_stations_parameter_values(parameter: ParameterName, start_datetime """ cur.execute( - f"""SELECT + """SELECT station_id, datetime, value, forecast FROM stations_all_params JOIN parameters ON stations_all_params.parameter = parameters.parameter_id - WHERE parameter_name = '{parameter}' AND datetime >= strftime('%s', '{start_datetime}') AND datetime < strftime('%s', '{end_datetime}') - """ + WHERE parameter_name = :parameter AND datetime >= strftime('%s', :start_datetime) AND datetime < strftime('%s', :end_datetime) + """, + { + "parameter": parameter, + "start_datetime": start_datetime, + "end_datetime": end_datetime + } ) stations_values = cur.fetchall() @@ -141,13 +146,18 @@ async def get_one_station_values(station_id: int, start_datetime: datetime, end_ """ cur.execute( - f"""SELECT + """SELECT datetime, parameter, value FROM stations_all_params - WHERE station_id = {station_id} AND datetime >= strftime('%s', '{start_datetime}') AND datetime < strftime('%s', '{end_datetime}') - """ + WHERE station_id = :station_id AND datetime >= strftime('%s', :start_datetime) AND datetime < strftime('%s', :end_datetime) + """, + { + "station_id": station_id, + "start_datetime": start_datetime, + "end_datetime": end_datetime + } ) one_station_values = cur.fetchall() @@ -215,15 +225,20 @@ async def get_net_parameter_values(parameter: ParameterName, start_datetime: dat """ cur.execute( - f"""SELECT + """SELECT grid_id, datetime, param_value, forecast FROM net_all_params JOIN parameters ON net_all_params.parameter = parameters.parameter_id - WHERE parameter_name = '{parameter}' AND datetime >= strftime('%s', '{start_datetime}') AND datetime < strftime('%s', '{end_datetime}') - """ + WHERE parameter_name = :parameter AND datetime >= strftime('%s', :start_datetime) AND datetime < strftime('%s', :end_datetime) + """, + { + "parameter": parameter, + "start_datetime": start_datetime, + "end_datetime": end_datetime + } ) net_values = cur.fetchall() diff --git a/repo b/repo new file mode 160000 index 0000000..2254c52 --- /dev/null +++ b/repo @@ -0,0 +1 @@ +Subproject commit 2254c524bdc5a11e7497c3eab08ce3cee86cc4f8