moved to migration strategy, moved daos to top lib

lib/database/daos/activities_dao.dart

@@ -1,35 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:sendtrain/database/database.dart';
-
-part 'activities_dao.g.dart';
-
-@DriftAccessor(tables: [Activities])
-class ActivitiesDao extends DatabaseAccessor<AppDatabase> with _$ActivitiesDaoMixin {
-  ActivitiesDao(super.db);
-
-  Future<List<Activity>> all() async {
-    return await select(activities).get();
-  }
-
-  Future<List<Activity>> find(int id) async {
-    return await (select(activities)..where((activity) => activity.id.equals(id) )).get();
-  }
-
-  Future<List<Activity>> sessionActivities(int id) async {
-     final result = select(db.sessionActivities).join(
-      [
-        innerJoin(
-          db.activities,
-          db.activities.id
-              .equalsExp(db.sessionActivities.activityId),
-        ),
-      ],
-    )..where(db.sessionActivities.sessionId.equals(id));
-
-    final activities = (await result.get())
-        .map((e) => e.readTable(db.activities))
-        .toList();
-
-    return activities;
-  }
-}

lib/database/daos/activities_dao.g.dart

@@ -1,8 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'activities_dao.dart';
-
-// ignore_for_file: type=lint
-mixin _$ActivitiesDaoMixin on DatabaseAccessor<AppDatabase> {
-  $ActivitiesTable get activities => attachedDatabase.activities;
-}

lib/database/daos/media_items_dao.dart

@@ -1,37 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:sendtrain/database/database.dart';
-
-part 'media_items_dao.g.dart';
-
-@DriftAccessor(tables: [MediaItems])
-class MediaItemsDao extends DatabaseAccessor<AppDatabase> with _$MediaItemsDaoMixin {
-  MediaItemsDao(super.db);
-
-  Future<List<MediaItem>> all() async {
-    return await select(mediaItems).get();
-  }
-
-  Future<List<MediaItem>> find(int id) async {
-    return await (select(mediaItems)..where((mediaItem) => mediaItem.id.equals(id) )).get();
-  }
-
-  Future<List<MediaItem>> mediaItemsFromSession(Session session) async {
-    final result = select(db.objectMediaItems).join(
-      [
-        innerJoin(
-          db.mediaItems,
-          db.mediaItems.id.equalsExp(db.objectMediaItems.mediaId),
-        ),
-      ],
-    )
-      ..where(
-          db.objectMediaItems.objectType.equals(ObjectType.sessions.name))
-      ..where(db.objectMediaItems.objectId.equals(session.id));
-
-    final mediaItems = (await result.get())
-        .map((e) => e.readTable(db.mediaItems))
-        .toList();
-
-    return mediaItems;
-  }
-}

lib/database/daos/media_items_dao.g.dart

@@ -1,8 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'media_items_dao.dart';
-
-// ignore_for_file: type=lint
-mixin _$MediaItemsDaoMixin on DatabaseAccessor<AppDatabase> {
-  $MediaItemsTable get mediaItems => attachedDatabase.mediaItems;
-}

lib/database/daos/session_activities_dao.dart

@@ -1,24 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:sendtrain/database/database.dart';
-
-part 'session_activities_dao.g.dart';
-
-@DriftAccessor(tables: [SessionActivities])
-class SessionActivitiesDao extends DatabaseAccessor<AppDatabase> with _$SessionActivitiesDaoMixin {
-  SessionActivitiesDao(super.db);
-
-  Future<List<SessionActivity>> all() async {
-    return await select(sessionActivities).get();
-  }
-
-  Future<List<SessionActivity>> find(int id) async {
-    return await (select(sessionActivities)..where((sessionActivity) => sessionActivity.id.equals(id) )).get();
-  }
-
-  Future<List<SessionActivity>> sessionActivitiesBySessionId(int id) async {
-    final result = db.managers.sessionActivities
-        .filter((sessionActivity) => sessionActivity.sessionId.id(id));
-
-    return result.get();
-  }
-}

lib/database/daos/session_activities_dao.g.dart

@@ -1,11 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'session_activities_dao.dart';
-
-// ignore_for_file: type=lint
-mixin _$SessionActivitiesDaoMixin on DatabaseAccessor<AppDatabase> {
-  $SessionsTable get sessions => attachedDatabase.sessions;
-  $ActivitiesTable get activities => attachedDatabase.activities;
-  $SessionActivitiesTable get sessionActivities =>
-      attachedDatabase.sessionActivities;
-}

lib/database/daos/sessions_dao.dart

@@ -1,17 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:sendtrain/database/database.dart';
-
-part 'sessions_dao.g.dart';
-
-@DriftAccessor(tables: [Sessions])
-class SessionsDao extends DatabaseAccessor<AppDatabase> with _$SessionsDaoMixin {
-  SessionsDao(super.db);
-
-  Future<List<Session>> all() async {
-    return await select(sessions).get();
-  }
-
-  Future<List<Session>> find(int id) async {
-    return await (select(sessions)..where((session) => session.id.equals(id) )).get();
-  }
-}

lib/database/daos/sessions_dao.g.dart

@@ -1,8 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'sessions_dao.dart';
-
-// ignore_for_file: type=lint
-mixin _$SessionsDaoMixin on DatabaseAccessor<AppDatabase> {
-  $SessionsTable get sessions => attachedDatabase.sessions;
-}

lib/database/database.dart

@@ -1,7 +1,7 @@
 import 'package:drift/drift.dart';
 import 'package:drift_flutter/drift_flutter.dart';
-import 'package:sendtrain/database/daos/activities_dao.dart';
-import 'package:sendtrain/database/daos/sessions_dao.dart';
+import 'package:sendtrain/daos/activities_dao.dart';
+import 'package:sendtrain/daos/sessions_dao.dart';
 import 'package:sendtrain/database/seed.dart';
 
 part 'database.g.dart';
@@ -124,7 +124,7 @@ class AppDatabase extends _$AppDatabase {
   AppDatabase() : super(_openConnection());
 
   @override
-  int get schemaVersion => 1;
+  int get schemaVersion => 2;
 
   @override
   MigrationStrategy get migration {

lib/database/database.steps.dart

@@ -0,0 +1,337 @@
+// dart format width=80
+import 'package:drift/internal/versioned_schema.dart' as i0;
+import 'package:drift/drift.dart' as i1;
+import 'package:drift/drift.dart'; // ignore_for_file: type=lint,unused_import
+
+// GENERATED BY drift_dev, DO NOT MODIFY.
+final class Schema2 extends i0.VersionedSchema {
+  Schema2({required super.database}) : super(version: 2);
+  @override
+  late final List<i1.DatabaseSchemaEntity> entities = [
+    sessions,
+    activities,
+    sessionActivities,
+    actions,
+    activityActions,
+    mediaItems,
+    objectMediaItems,
+  ];
+  late final Shape0 sessions = Shape0(
+      source: i0.VersionedTable(
+        entityName: 'sessions',
+        withoutRowId: false,
+        isStrict: false,
+        tableConstraints: [],
+        columns: [
+          _column_0,
+          _column_1,
+          _column_2,
+          _column_3,
+          _column_4,
+          _column_5,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape1 activities = Shape1(
+      source: i0.VersionedTable(
+        entityName: 'activities',
+        withoutRowId: false,
+        isStrict: false,
+        tableConstraints: [],
+        columns: [
+          _column_0,
+          _column_1,
+          _column_6,
+          _column_2,
+          _column_7,
+          _column_5,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape2 sessionActivities = Shape2(
+      source: i0.VersionedTable(
+        entityName: 'session_activities',
+        withoutRowId: false,
+        isStrict: false,
+        tableConstraints: [],
+        columns: [
+          _column_0,
+          _column_8,
+          _column_9,
+          _column_10,
+          _column_11,
+          _column_5,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape3 actions = Shape3(
+      source: i0.VersionedTable(
+        entityName: 'actions',
+        withoutRowId: false,
+        isStrict: false,
+        tableConstraints: [],
+        columns: [
+          _column_0,
+          _column_1,
+          _column_2,
+          _column_12,
+          _column_5,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape4 activityActions = Shape4(
+      source: i0.VersionedTable(
+        entityName: 'activity_actions',
+        withoutRowId: false,
+        isStrict: false,
+        tableConstraints: [],
+        columns: [
+          _column_0,
+          _column_9,
+          _column_13,
+          _column_5,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape5 mediaItems = Shape5(
+      source: i0.VersionedTable(
+        entityName: 'media_items',
+        withoutRowId: false,
+        isStrict: false,
+        tableConstraints: [],
+        columns: [
+          _column_0,
+          _column_1,
+          _column_2,
+          _column_14,
+          _column_6,
+          _column_5,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+  late final Shape6 objectMediaItems = Shape6(
+      source: i0.VersionedTable(
+        entityName: 'object_media_items',
+        withoutRowId: false,
+        isStrict: false,
+        tableConstraints: [],
+        columns: [
+          _column_0,
+          _column_15,
+          _column_16,
+          _column_17,
+          _column_5,
+        ],
+        attachedDatabase: database,
+      ),
+      alias: null);
+}
+
+class Shape0 extends i0.VersionedTable {
+  Shape0({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<int> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get title =>
+      columnsByName['title']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get content =>
+      columnsByName['body']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get status =>
+      columnsByName['status']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<DateTime> get date =>
+      columnsByName['date']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<DateTime> get createdAt =>
+      columnsByName['created_at']! as i1.GeneratedColumn<DateTime>;
+}
+
+i1.GeneratedColumn<int> _column_0(String aliasedName) =>
+    i1.GeneratedColumn<int>('id', aliasedName, false,
+        hasAutoIncrement: true,
+        type: i1.DriftSqlType.int,
+        defaultConstraints:
+            i1.GeneratedColumn.constraintIsAlways('PRIMARY KEY AUTOINCREMENT'));
+i1.GeneratedColumn<String> _column_1(String aliasedName) =>
+    i1.GeneratedColumn<String>('title', aliasedName, false,
+        additionalChecks: i1.GeneratedColumn.checkTextLength(
+            minTextLength: 3, maxTextLength: 32),
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<String> _column_2(String aliasedName) =>
+    i1.GeneratedColumn<String>('body', aliasedName, false,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<String> _column_3(String aliasedName) =>
+    i1.GeneratedColumn<String>('status', aliasedName, false,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<DateTime> _column_4(String aliasedName) =>
+    i1.GeneratedColumn<DateTime>('date', aliasedName, true,
+        type: i1.DriftSqlType.dateTime);
+i1.GeneratedColumn<DateTime> _column_5(String aliasedName) =>
+    i1.GeneratedColumn<DateTime>('created_at', aliasedName, false,
+        type: i1.DriftSqlType.dateTime, defaultValue: Variable(DateTime.now()));
+
+class Shape1 extends i0.VersionedTable {
+  Shape1({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<int> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get title =>
+      columnsByName['title']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get type =>
+      columnsByName['type']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get description =>
+      columnsByName['body']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get category =>
+      columnsByName['category']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<DateTime> get createdAt =>
+      columnsByName['created_at']! as i1.GeneratedColumn<DateTime>;
+}
+
+i1.GeneratedColumn<String> _column_6(String aliasedName) =>
+    i1.GeneratedColumn<String>('type', aliasedName, false,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<String> _column_7(String aliasedName) =>
+    i1.GeneratedColumn<String>('category', aliasedName, false,
+        type: i1.DriftSqlType.string);
+
+class Shape2 extends i0.VersionedTable {
+  Shape2({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<int> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get sessionId =>
+      columnsByName['session_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get activityId =>
+      columnsByName['activity_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get results =>
+      columnsByName['results']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get achievements =>
+      columnsByName['achievements']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<DateTime> get createdAt =>
+      columnsByName['created_at']! as i1.GeneratedColumn<DateTime>;
+}
+
+i1.GeneratedColumn<int> _column_8(String aliasedName) =>
+    i1.GeneratedColumn<int>('session_id', aliasedName, false,
+        type: i1.DriftSqlType.int,
+        defaultConstraints:
+            i1.GeneratedColumn.constraintIsAlways('REFERENCES sessions (id)'));
+i1.GeneratedColumn<int> _column_9(String aliasedName) =>
+    i1.GeneratedColumn<int>('activity_id', aliasedName, false,
+        type: i1.DriftSqlType.int,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'REFERENCES activities (id)'));
+i1.GeneratedColumn<String> _column_10(String aliasedName) =>
+    i1.GeneratedColumn<String>('results', aliasedName, true,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<String> _column_11(String aliasedName) =>
+    i1.GeneratedColumn<String>('achievements', aliasedName, true,
+        type: i1.DriftSqlType.string);
+
+class Shape3 extends i0.VersionedTable {
+  Shape3({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<int> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get title =>
+      columnsByName['title']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get description =>
+      columnsByName['body']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get set =>
+      columnsByName['set']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<DateTime> get createdAt =>
+      columnsByName['created_at']! as i1.GeneratedColumn<DateTime>;
+}
+
+i1.GeneratedColumn<String> _column_12(String aliasedName) =>
+    i1.GeneratedColumn<String>('set', aliasedName, false,
+        type: i1.DriftSqlType.string);
+
+class Shape4 extends i0.VersionedTable {
+  Shape4({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<int> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get activityId =>
+      columnsByName['activity_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get actionId =>
+      columnsByName['action_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<DateTime> get createdAt =>
+      columnsByName['created_at']! as i1.GeneratedColumn<DateTime>;
+}
+
+i1.GeneratedColumn<int> _column_13(String aliasedName) =>
+    i1.GeneratedColumn<int>('action_id', aliasedName, false,
+        type: i1.DriftSqlType.int,
+        defaultConstraints:
+            i1.GeneratedColumn.constraintIsAlways('REFERENCES actions (id)'));
+
+class Shape5 extends i0.VersionedTable {
+  Shape5({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<int> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get title =>
+      columnsByName['title']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get description =>
+      columnsByName['body']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get reference =>
+      columnsByName['reference']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get type =>
+      columnsByName['type']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<DateTime> get createdAt =>
+      columnsByName['created_at']! as i1.GeneratedColumn<DateTime>;
+}
+
+i1.GeneratedColumn<String> _column_14(String aliasedName) =>
+    i1.GeneratedColumn<String>('reference', aliasedName, false,
+        additionalChecks: i1.GeneratedColumn.checkTextLength(
+            minTextLength: 3, maxTextLength: 256),
+        type: i1.DriftSqlType.string);
+
+class Shape6 extends i0.VersionedTable {
+  Shape6({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<int> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get objectId =>
+      columnsByName['object_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get objectType =>
+      columnsByName['object_type']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get mediaId =>
+      columnsByName['media_id']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<DateTime> get createdAt =>
+      columnsByName['created_at']! as i1.GeneratedColumn<DateTime>;
+}
+
+i1.GeneratedColumn<int> _column_15(String aliasedName) =>
+    i1.GeneratedColumn<int>('object_id', aliasedName, false,
+        type: i1.DriftSqlType.int);
+i1.GeneratedColumn<String> _column_16(String aliasedName) =>
+    i1.GeneratedColumn<String>('object_type', aliasedName, false,
+        type: i1.DriftSqlType.string);
+i1.GeneratedColumn<int> _column_17(String aliasedName) =>
+    i1.GeneratedColumn<int>('media_id', aliasedName, false,
+        type: i1.DriftSqlType.int,
+        defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+            'REFERENCES media_items (id)'));
+i0.MigrationStepWithVersion migrationSteps({
+  required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
+}) {
+  return (currentVersion, database) async {
+    switch (currentVersion) {
+      case 1:
+        final schema = Schema2(database: database);
+        final migrator = i1.Migrator(database, schema);
+        await from1To2(migrator, schema);
+        return 2;
+      default:
+        throw ArgumentError.value('Unknown migration from $currentVersion');
+    }
+  };
+}
+
+i1.OnUpgrade stepByStep({
+  required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
+}) =>
+    i0.VersionedSchema.stepByStepHelper(
+        step: migrationSteps(
+      from1To2: from1To2,
+    ));