From 0372185e962bae57c3668e9e632a41fe8a75405f Mon Sep 17 00:00:00 2001
From: fbachus <felix.bachstein@gmail.com>
Date: Thu, 30 Jul 2026 22:02:21 +0200
Subject: [PATCH] fix(database): unify vehicle id column name

---
 lib/transport_helper.dart | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/transport_helper.dart b/lib/transport_helper.dart
index e1cc12d..4b90524 100644
--- a/lib/transport_helper.dart
+++ b/lib/transport_helper.dart
@@ -493,7 +493,7 @@ class Segment {
     FROM $tableName s
     JOIN $departure start ON s.startid = start.id
     JOIN $departure end ON s.endid = end.id
-    JOIN $vehicle v ON s.vehicleid = v.id
+    JOIN $vehicle v ON s.vehicleid = v.vehicleid
     where s.id = $id;
     """,
     );
@@ -526,7 +526,7 @@ class Segment {
       "departuretime": seg["end_departuretime"] as String,
     };
     Map<String, String> vehicleMap = {
-      "id": seg["vehicleid"] as String,
+      "vehicleid": seg["vehicleid"] as String,
       "name": seg["vehiclename"] as String,
       "line": seg["vehicleline"] as String,
     };
@@ -735,7 +735,7 @@ class Vehicle {
 
   Map<String, Object?> _toMap() {
     return {
-      "id": vehicleid,
+      "vehicleid": vehicleid,
       "name": name,
       "line": vehicleLineId,
     };
@@ -745,7 +745,7 @@ class Vehicle {
     Map<String, Object?> map,
   ) {
     return Vehicle(
-      vehicleid: map["id"] as String,
+      vehicleid: map["vehicleid"] as String,
       name: map["name"] as String,
       vehicleLineId: map["line"] as String,
     );
@@ -775,7 +775,7 @@ class Vehicle {
     Database database = DbHelper.db;
     var vehicleMap = await database.query(
       tableName,
-      where: "id = ?",
+      where: "vehicleid = ?",
       whereArgs: [vehicleId],
     );
     return Vehicle.fromMap(vehicleMap.first);
@@ -792,7 +792,12 @@ class Vehicle {
 
   void dbUpdate() async {
     Database database = DbHelper.db;
-    database.update(tableName, _toMap(), where: "id=?", whereArgs: [vehicleid]);
+    database.update(
+      tableName,
+      _toMap(),
+      where: "vehicleid=?",
+      whereArgs: [vehicleid],
+    );
   }
 
   void dbDelete() async {