# Conflicts:
#	lib/presentation/views/main_menu/match_view/create_match/create_match_view.dart

@@ -17,1 +17,4 @@
             "type": "string"
+          },
+          "description": {
+            "type": ["string", "null"]

@@ -18,0 +23,4 @@
+        "required": [
+          "id",
+          "createdAt",
+          "name"

@@ -18,0 +42,4 @@
+            "type": "string"
+          },
+          "ruleset": {
+            "type": ["string", "null"]

@@ -18,0 +45,4 @@
+            "type": ["string", "null"]
+          },
+          "description": {
+            "type": ["string", "null"]

@@ -18,0 +48,4 @@
+            "type": ["string", "null"]
+          },
+          "color": {
+            "type": ["integer", "null"]

@@ -18,0 +51,4 @@
+            "type": ["integer", "null"]
+          },
+          "icon": {
+            "type": ["string", "null"]

@@ -67,6 +136,12 @@
           "createdAt": {
             "type": "string"
           },
+          "gameId": {

@@ -68,2 +137,4 @@
             "type": "string"
           },
+          "gameId": {
+            "anyOf": [

@@ -70,0 +139,4 @@
+          "gameId": {
+            "anyOf": [
+              {"type": "string"},
+              {"type": "null"}

@@ -326,0 +378,4 @@
+    required String matchId,
+    required String winnerId,
+  }) async {
+    // TODO: Implement winner persistence

@@ -326,0 +385,4 @@
+  /// TEMPORARY: Removes the winner of a match.
+  /// Currently does nothing - winner is not persisted.
+  Future<bool> removeWinner({required String matchId}) async {
+    // TODO: Implement winner persistence

@@ -39,3 +47,3 @@
 
   @override
-  int get schemaVersion => 1;
+  int get schemaVersion => 2;

@@ -0,0 +3,4 @@
+class GameTable extends Table {
+  TextColumn get id => text()();
+  TextColumn get name => text()();
+  TextColumn get ruleset => text()();

@@ -0,0 +4,4 @@
+  TextColumn get id => text()();
+  TextColumn get name => text()();
+  TextColumn get ruleset => text()();
+  TextColumn get description => text().nullable()();

@@ -3,6 +3,7 @@ import 'package:drift/drift.dart';
 class GroupTable extends Table {
   TextColumn get id => text()();
   TextColumn get name => text()();
+  TextColumn get description => text().nullable()();

@@ -7,0 +7,4 @@
+  TextColumn get gameId =>
+      text().references(GameTable, #id, onDelete: KeyAction.cascade)();
+  TextColumn get groupId =>
+      text().references(GroupTable, #id, onDelete: KeyAction.cascade).nullable()(); // Nullable if not part of a group

@@ -7,0 +8,4 @@
+      text().references(GameTable, #id, onDelete: KeyAction.cascade)();
+  TextColumn get groupId =>
+      text().references(GroupTable, #id, onDelete: KeyAction.cascade).nullable()(); // Nullable if not part of a group
+  TextColumn get name => text().nullable()();

@@ -7,0 +9,4 @@
+  TextColumn get groupId =>
+      text().references(GroupTable, #id, onDelete: KeyAction.cascade).nullable()(); // Nullable if not part of a group
+  TextColumn get name => text().nullable()();
+  TextColumn get notes => text().nullable()();

@@ -3,6 +3,7 @@ import 'package:drift/drift.dart';
 class PlayerTable extends Table {
   TextColumn get id => text()();
   TextColumn get name => text()();
+  TextColumn get description => text().nullable()();

@@ -0,0 +5,4 @@
+  final String id;
+  final DateTime createdAt;
+  final String name;
+  final String? ruleset;

@@ -0,0 +6,4 @@
+  final DateTime createdAt;
+  final String name;
+  final String? ruleset;
+  final String? description;

@@ -0,0 +7,4 @@
+  final String name;
+  final String? ruleset;
+  final String? description;
+  final int? color;

@@ -0,0 +8,4 @@
+  final String? ruleset;
+  final String? description;
+  final int? color;
+  final String? icon;

@@ -6,3 +6,3 @@
   final String id;
-  final DateTime createdAt;
   final String name;
+  final String? description;

@@ -8,3 +9,3 @@
   final DateTime createdAt;
   final String name;
-  final List<Player>? players;
+  final Game? game;

@@ -10,2 +11,3 @@
-  final List<Player>? players;
+  final Game? game;
   final Group? group;
+  final List<Player>? players;

@@ -0,0 +1,16 @@
+import 'package:game_tracker/data/dto/team.dart';
+
+class Pair extends Team {

@@ -5,26 +5,33 @@ class Player {
   final String id;
   final DateTime createdAt;
   final String name;
+  final String? description;

@@ -320,2 +153,2 @@
-        expect(newWinner.createdAt, testPlayer5.createdAt);
-      }
+      final allGames = await database.gameDao.getAllGames();
+      expect(allGames.length, 3);

@@ -0,0 +67,4 @@
+
+  /// Adds multiple [games] to the database in a batch operation.
+  /// Uses insertOrIgnore to avoid overwriting existing games.
+  Future<bool> addGamesAsList({required List<Game> games}) async {

@@ -28,3 +28,3 @@
 
     if (!await db.playerDao.playerExists(playerId: player.id)) {
-      db.playerDao.addPlayer(player: player);
+      await db.playerDao.addPlayer(player: player);

@@ -67,11 +142,14 @@
           "createdAt": {
             "type": "string"
           },
+          "endedAt": {

@@ -0,0 +36,4 @@
+    return Game(
+      id: result.id,
+      name: result.name,
+      ruleset: Ruleset.values.firstWhere((e) => e.name == result.ruleset),

@@ -6,1 +7,3 @@
-  late final winnerId = text().nullable()();
+  TextColumn get gameId =>
+      text().references(GameTable, #id, onDelete: KeyAction.cascade)();
+  // Nullable if not part of a group

@@ -0,0 +16,4 @@
+    DateTime? createdAt,
+    required this.name,
+    required this.ruleset,
+    required this.description,

@@ -12,3 +13,4 @@
     String? id,
     DateTime? createdAt,
     required this.name,
+    required this.description,

@@ -11,1 +13,4 @@
+  final Game game;
   final Group? group;
+  final List<Player> players;
+  final String notes;

@@ -12,0 +11,4 @@
+    String? id,
+    DateTime? createdAt,
+    required this.name,
+    required this.description,