Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Drop unread row counts from database deletes

laurensprieme6e2dbfa0f7a
diff --git a/mobile/apps/photos/lib/db/memories_db.dart b/mobile/apps/photos/lib/db/memories_db.dart
index 84bfeaf6b2..26c0381b1e 100644
--- a/mobile/apps/photos/lib/db/memories_db.dart
+++ b/mobile/apps/photos/lib/db/memories_db.dart
@@ -63,30 +63,26 @@ class MemoriesDB with SqlDbBase {
await db.execute('DELETE FROM $table');
}
- Future<int> clearMemoriesSeenBeforeTime(int timestamp) async {
+ Future<void> clearMemoriesSeenBeforeTime(int timestamp) async {
final db = await database;
- final rows = await db.execute(
- 'DELETE FROM $table WHERE $columnSeenTime < ? RETURNING $columnFileID',
- [timestamp],
- );
- return rows.length;
+ await db.execute('DELETE FROM $table WHERE $columnSeenTime < ?', [
+ timestamp,
+ ]);
}
- Future<int> markMemoryAsSeen(
+ Future<void> markMemoryAsSeen(
Memory memory,
int timestamp, {
int? seenTimeKey,
}) async {
final db = await database;
- final rows = await db.execute(
+ await db.execute(
'''
INSERT OR REPLACE INTO $table ($columnFileID, $columnSeenTime)
VALUES (?, ?)
- RETURNING $columnFileID
''',
[seenTimeKey ?? memory.file.generatedID, timestamp],
);
- return rows.first[columnFileID] as int;
}
Future<Map<int, int>> getSeenTimes() async {
diff --git a/mobile/apps/photos/lib/db/social_db.dart b/mobile/apps/photos/lib/db/social_db.dart
index 485b970a0e..f08b65e6a7 100644
--- a/mobile/apps/photos/lib/db/social_db.dart
+++ b/mobile/apps/photos/lib/db/social_db.dart
@@ -698,14 +698,20 @@ class SocialDB with SqlDbBase {
Future<int> deleteAllComments() async {
final db = await database;
- final rows = await db.execute('DELETE FROM $_commentsTable RETURNING id');
- return rows.length;
+ return db.writeTransaction((tx) async {
+ await tx.execute('DELETE FROM $_commentsTable');
+ final row = await tx.get('SELECT changes() AS count');
+ return row['count'] as int;
+ });
}
Future<int> deleteAllReactions() async {
final db = await database;
- final rows = await db.execute('DELETE FROM $_reactionsTable RETURNING id');
- return rows.length;
+ return db.writeTransaction((tx) async {
+ await tx.execute('DELETE FROM $_reactionsTable');
+ final row = await tx.get('SELECT changes() AS count');
+ return row['count'] as int;
+ });
}
Future<void> seedExampleData() async {}
diff --git a/mobile/apps/photos/lib/db/trash_db.dart b/mobile/apps/photos/lib/db/trash_db.dart
index 3376b36e17..235bc2830b 100644
--- a/mobile/apps/photos/lib/db/trash_db.dart
+++ b/mobile/apps/photos/lib/db/trash_db.dart
@@ -157,26 +157,43 @@ class TrashDB with SqlDbBase {
return deletedRows;
}
- Future<int> update(EnteTrashFile file) async {
+ Future<void> update(EnteTrashFile file) async {
final db = await instance.database;
- final rows = await db.execute(
+ await db.execute(
'''
UPDATE $tableName SET
$columnTrashUpdatedAt = ?, $columnTrashDeleteBy = ?,
- $columnUploadedFileID = ?, $columnCollectionID = ?,
- $columnOwnerID = ?, $columnEncryptedKey = ?,
- $columnKeyDecryptionNonce = ?, $columnFileDecryptionHeader = ?,
- $columnThumbnailDecryptionHeader = ?, $columnUpdationTime = ?,
- $columnFileSize = ?, $columnLocalID = ?, $columnCreationTime = ?,
+ $columnCollectionID = ?, $columnOwnerID = ?,
+ $columnEncryptedKey = ?, $columnKeyDecryptionNonce = ?,
+ $columnFileDecryptionHeader = ?, $columnThumbnailDecryptionHeader = ?,
+ $columnUpdationTime = ?, $columnFileSize = ?,
+ $columnLocalID = ?, $columnCreationTime = ?,
$columnFileMetadata = ?, $columnMMdVersion = ?,
$columnMMdEncodedJson = ?, $columnPubMMdVersion = ?,
$columnPubMMdEncodedJson = ?
WHERE $columnUploadedFileID = ?
- RETURNING $columnUploadedFileID
''',
- [..._getParametersForTrash(file), file.uploadedFileID],
+ [
+ file.updateAt,
+ file.deleteBy,
+ file.collectionID,
+ file.ownerID,
+ file.encryptedKey,
+ file.keyDecryptionNonce,
+ file.fileDecryptionHeader,
+ file.thumbnailDecryptionHeader,
+ file.updationTime,
+ file.fileSize,
+ file.localID,
+ file.creationTime,
+ jsonEncode(file.metadata),
+ file.mMdVersion,
+ file.mMdEncodedJson ?? '{}',
+ file.pubMmdVersion,
+ file.pubMmdEncodedJson ?? '{}',
+ file.uploadedFileID,
+ ],
);
- return rows.length;
}
Future<FileLoadResult> getTrashedFiles(
diff --git a/mobile/apps/photos/lib/db/upload_locks_db.dart b/mobile/apps/photos/lib/db/upload_locks_db.dart
index fb7b76a0ba..5160756439 100644
--- a/mobile/apps/photos/lib/db/upload_locks_db.dart
+++ b/mobile/apps/photos/lib/db/upload_locks_db.dart
@@ -257,31 +257,27 @@ class UploadLocksDB with SqlDbBase {
return rows.length;
}
- Future<int> releaseLocksAcquiredByOwnerBefore(String owner, int time) async {
+ Future<void> releaseLocksAcquiredByOwnerBefore(String owner, int time) async {
final db = await database;
- final rows = await db.execute(
+ await db.execute(
'''
DELETE FROM ${_uploadLocksTable.table}
WHERE ${_uploadLocksTable.columnOwner} = ?
AND ${_uploadLocksTable.columnTime} < ?
- RETURNING ${_uploadLocksTable.columnID}
''',
[owner, time],
);
- return rows.length;
}
- Future<int> releaseAllLocksAcquiredBefore(int time) async {
+ Future<void> releaseAllLocksAcquiredBefore(int time) async {
final db = await database;
- final rows = await db.execute(
+ await db.execute(
'''
DELETE FROM ${_uploadLocksTable.table}
WHERE ${_uploadLocksTable.columnTime} < ?
- RETURNING ${_uploadLocksTable.columnID}
''',
[time],
);
- return rows.length;
}
Future<({String encryptedFileKey, String fileNonce, String keyNonce})>
@@ -457,17 +453,15 @@ class UploadLocksDB with SqlDbBase {
);
}
- Future<int> deleteStreamUploadErrorEntry(int uploadedFileID) async {
+ Future<void> deleteStreamUploadErrorEntry(int uploadedFileID) async {
final db = await database;
- final rows = await db.execute(
+ await db.execute(
'''
DELETE FROM ${_streamUploadErrorTable.table}
WHERE ${_streamUploadErrorTable.columnUploadedFileID} = ?
- RETURNING ${_streamUploadErrorTable.columnUploadedFileID}
''',
[uploadedFileID],
);
- return rows.length;
}
Future<Map<int, String>> getStreamUploadError() {
@@ -593,17 +587,15 @@ class UploadLocksDB with SqlDbBase {
);
}
- Future<int> deleteMultipartTrack(String localId) async {
+ Future<void> deleteMultipartTrack(String localId) async {
final db = await database;
- final rows = await db.execute(
+ await db.execute(
'''
DELETE FROM ${_trackUploadTable.table}
WHERE ${_trackUploadTable.columnLocalID} = ?
- RETURNING ${_trackUploadTable.columnID}
''',
[localId],
);
- return rows.length;
}
Future<Map<String, int>> getFileNameToLastAttemptedAtMap() {