Skip to content

High performance self-hosted photo and video management solution.

fix: null local date time in timeline queries (#26133)

shenlongec4de54ea2b5
diff --git a/mobile/lib/infrastructure/repositories/timeline.repository.dart b/mobile/lib/infrastructure/repositories/timeline.repository.dart
index 0e145395df..7544b4b2ac 100644
--- a/mobile/lib/infrastructure/repositories/timeline.repository.dart
+++ b/mobile/lib/infrastructure/repositories/timeline.repository.dart
@@ -203,7 +203,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
final album = albums.first;
final isAscending = album.order == AlbumAssetOrder.asc;
final assetCountExp = _db.remoteAssetEntity.id.count();
- final dateExp = _db.remoteAssetEntity.localDateTime.dateFmt(groupBy);
+ final dateExp = _db.remoteAssetEntity.effectiveCreatedAt(groupBy);
final query = _db.remoteAssetEntity.selectOnly()
..addColumns([assetCountExp, dateExp])
@@ -361,7 +361,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
}
final assetCountExp = _db.remoteAssetEntity.id.count();
- final dateExp = _db.remoteAssetEntity.localDateTime.dateFmt(groupBy);
+ final dateExp = _db.remoteAssetEntity.effectiveCreatedAt(groupBy);
final query = _db.remoteAssetEntity.selectOnly()
..addColumns([assetCountExp, dateExp])
@@ -431,7 +431,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
}
final assetCountExp = _db.remoteAssetEntity.id.count();
- final dateExp = _db.remoteAssetEntity.localDateTime.dateFmt(groupBy);
+ final dateExp = _db.remoteAssetEntity.effectiveCreatedAt(groupBy);
final query = _db.remoteAssetEntity.selectOnly()
..addColumns([assetCountExp, dateExp])
@@ -501,7 +501,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
}
final assetCountExp = _db.remoteAssetEntity.id.count();
- final dateExp = _db.remoteAssetEntity.localDateTime.dateFmt(groupBy);
+ final dateExp = _db.remoteAssetEntity.effectiveCreatedAt(groupBy);
final query = _db.remoteAssetEntity.selectOnly()
..addColumns([assetCountExp, dateExp])
@@ -603,7 +603,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
}
final assetCountExp = _db.remoteAssetEntity.id.count();
- final dateExp = _db.remoteAssetEntity.localDateTime.dateFmt(groupBy);
+ final dateExp = _db.remoteAssetEntity.effectiveCreatedAt(groupBy);
final query = _db.remoteAssetEntity.selectOnly()
..addColumns([assetCountExp, dateExp])
@@ -678,6 +678,11 @@ extension on Expression<DateTime> {
}
}
+extension on $RemoteAssetEntityTable {
+ Expression<String> effectiveCreatedAt(GroupAssetsBy groupBy) =>
+ coalesce([localDateTime.dateFmt(groupBy), createdAt.dateFmt(groupBy, toLocal: true)]);
+}
+
extension on String {
DateTime truncateDate(GroupAssetsBy groupBy) {
final format = switch (groupBy) {