From 17d91d50c8a59eb6901abe65de5b14c2b5beb78f Mon Sep 17 00:00:00 2001
From: Dashie <dashie@sigpipe.me>
Date: Tue, 9 Aug 2022 14:26:37 +0200
Subject: [PATCH] more db unicode fixes
---
.../trackdirect/collector/PacketBatchInserter.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/server/trackdirect/collector/PacketBatchInserter.py b/server/trackdirect/collector/PacketBatchInserter.py
index 199b3ca..a0899d4 100644
--- a/server/trackdirect/collector/PacketBatchInserter.py
+++ b/server/trackdirect/collector/PacketBatchInserter.py
@@ -237,10 +237,10 @@ class PacketBatchInserter():
# insert into packetYYYYMMDD_path
if pathTuples:
try:
- argString = ','.join(cur.mogrify(
+ argString = b','.join(cur.mogrify(
"(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", x) for x in pathTuples)
cur.execute("insert into " + packetPathTable +
- "(packet_id, station_id, latitude, longitude, timestamp, distance, number, sending_station_id, sending_latitude, sending_longitude) values " + argString)
+ "(packet_id, station_id, latitude, longitude, timestamp, distance, number, sending_station_id, sending_latitude, sending_longitude) values " + argString.decode())
except psycopg2.InterfaceError as e:
# Connection to database is lost, better just exit
raise e
@@ -286,10 +286,10 @@ class PacketBatchInserter():
# insert into packetYYYYMMDD_weather
if weatherTuples:
try:
- argString = ','.join(cur.mogrify(
+ argString = b','.join(cur.mogrify(
"(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", x) for x in weatherTuples)
cur.execute("insert into " + packetWeatherTable +
- "(packet_id, station_id, timestamp, humidity, pressure, rain_1h, rain_24h, rain_since_midnight, temperature, wind_direction, wind_gust, wind_speed, luminosity, snow, wx_raw_timestamp) values " + argString)
+ "(packet_id, station_id, timestamp, humidity, pressure, rain_1h, rain_24h, rain_since_midnight, temperature, wind_direction, wind_gust, wind_speed, luminosity, snow, wx_raw_timestamp) values " + argString.decode())
except psycopg2.InterfaceError as e:
# Connection to database is lost, better just exit
raise e
@@ -330,9 +330,9 @@ class PacketBatchInserter():
# insert into packetYYYYMMDD_ogn
if ognTuples:
try:
- argString = ','.join(cur.mogrify(
+ argString = b','.join(cur.mogrify(
"(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", x) for x in ognTuples)
- cur.execute("insert into " + packetOgnTable + "(packet_id, station_id, timestamp, ogn_sender_address, ogn_address_type_id, ogn_aircraft_type_id, ogn_climb_rate, ogn_turn_rate, ogn_signal_to_noise_ratio, ogn_bit_errors_corrected, ogn_frequency_offset) values " + argString)
+ cur.execute("insert into " + packetOgnTable + "(packet_id, station_id, timestamp, ogn_sender_address, ogn_address_type_id, ogn_aircraft_type_id, ogn_climb_rate, ogn_turn_rate, ogn_signal_to_noise_ratio, ogn_bit_errors_corrected, ogn_frequency_offset) values " + argString.decode())
except psycopg2.InterfaceError as e:
# Connection to database is lost, better just exit
raise e
@@ -374,10 +374,10 @@ class PacketBatchInserter():
# insert into packetYYYYMMDD_telemetry
if telemetryTuples:
try:
- argString = ','.join(cur.mogrify(
+ argString = b','.join(cur.mogrify(
"(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", x) for x in telemetryTuples)
cur.execute("insert into " + packetTelemetryTable +
- "(packet_id, station_id, timestamp, val1, val2, val3, val4, val5, bits, seq) values " + argString + " returning id")
+ "(packet_id, station_id, timestamp, val1, val2, val3, val4, val5, bits, seq) values " + argString.decode() + " returning id")
except psycopg2.InterfaceError as e:
# Connection to database is lost, better just exit
raise e
--
GitLab