From 9360158a019655c67c8e8c49f1615f328cf6ad0d Mon Sep 17 00:00:00 2001
From: Dashie <dashie@sigpipe.me>
Date: Tue, 9 Aug 2022 12:17:54 +0200
Subject: [PATCH] py3: fix unicode handling

---
 server/trackdirect/collector/PacketBatchInserter.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/server/trackdirect/collector/PacketBatchInserter.py b/server/trackdirect/collector/PacketBatchInserter.py
index 1cbc853..199b3ca 100644
--- a/server/trackdirect/collector/PacketBatchInserter.py
+++ b/server/trackdirect/collector/PacketBatchInserter.py
@@ -176,12 +176,11 @@ class PacketBatchInserter():
                                      packet.rawPath,
                                      packet.raw))
 
-        sql = ""
         try:
             # insert into packetYYYYMMDD
-            argString = ','.join(cur.mogrify(
+            argString = b','.join(cur.mogrify(
                 "(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", x) for x in datePacketTuples)
-            sql = "insert into " + packetTable + "(station_id, sender_id, map_id, source_id, packet_type_id, latitude, longitude, posambiguity, symbol, symbol_table, map_sector, related_map_sectors, marker_id, marker_counter, speed, course, altitude, rng, phg, latest_phg_timestamp, latest_rng_timestamp, timestamp, packet_tail_timestamp, is_moving, reported_timestamp, position_timestamp, comment, raw_path, raw) values " + argString + " RETURNING id"
+            sql = "insert into " + packetTable + "(station_id, sender_id, map_id, source_id, packet_type_id, latitude, longitude, posambiguity, symbol, symbol_table, map_sector, related_map_sectors, marker_id, marker_counter, speed, course, altitude, rng, phg, latest_phg_timestamp, latest_rng_timestamp, timestamp, packet_tail_timestamp, is_moving, reported_timestamp, position_timestamp, comment, raw_path, raw) values " + argString.decode() + " RETURNING id"
             cur.execute(sql)
         except psycopg2.InterfaceError as e:
             # Connection to database is lost, better just exit
-- 
GitLab