refactor(storage): remove unneeded idempotency guard in 14→15

Author: wired-pasteque

lib/core/storage/migrations/schema_14_to_15.dart

@@ -1,5 +1,4 @@
 import 'package:bb_mobile/core/storage/sqlite_database.steps.dart';
-import 'package:bb_mobile/core/utils/logger.dart';
 import 'package:drift/drift.dart';
 
 /// Migration from version 14 to 15.
@@ -13,41 +12,14 @@ import 'package:drift/drift.dart';
 ///   the user opts out).
 class Schema14To15 {
   static Future<void> migrate(Migrator m, Schema15 schema15) async {
-    await _addColumnIfNotExists(
-      () => m.addColumn(schema15.settings, schema15.settings.torTransportMode),
-      'settings.tor_transport_mode column',
+    await m.addColumn(schema15.settings, schema15.settings.torTransportMode);
+    await m.addColumn(
+      schema15.settings,
+      schema15.settings.lastSuccessfulTorTransport,
     );
-    await _addColumnIfNotExists(
-      () => m.addColumn(
-        schema15.settings,
-        schema15.settings.lastSuccessfulTorTransport,
-      ),
-      'settings.last_successful_tor_transport column',
-    );
-    await _addColumnIfNotExists(
-      () => m.addColumn(
-        schema15.settings,
-        schema15.settings.screenCaptureProtectionEnabled,
-      ),
-      'settings.screen_capture_protection_enabled column',
-    );
-  }
-}
-
-Future<void> _addColumnIfNotExists(
-  Future<void> Function() addColumn,
-  String description,
-) async {
-  try {
-    await addColumn();
-  } catch (e) {
-    // Idempotency guard: only swallow "duplicate column" (a re-run over a
-    // partially-applied migration) — log it so a driver wording change surfaces
-    // instead of silently becoming a hard failure.
-    if (!e.toString().contains('duplicate column')) rethrow;
-    log.warning(
-      'Schema14To15: $description already exists — skipping add',
-      error: e,
+    await m.addColumn(
+      schema15.settings,
+      schema15.settings.screenCaptureProtectionEnabled,
     );
   }
 }

test/migrations_test/bull_database/schema_v14_to_v15_test.dart

@@ -46,37 +46,4 @@ void main() {
     expect(settings.single.screenCaptureProtectionEnabled, 1);
     await migratedDb.close();
   });
-
-  test(
-    'v14 to v15 tolerates tor columns already present (idempotency guard)',
-    () async {
-      final schema = await verifier.schemaAt(14);
-
-      // Simulate a dev device that received the tor columns from develop's
-      // earlier, broken 13->14 build: add them onto the released v14 settings
-      // table before upgrading.
-      final seeded = v14.DatabaseAtV14(schema.newConnection());
-      await seeded.customStatement(
-        "ALTER TABLE settings ADD COLUMN tor_transport_mode TEXT NOT NULL "
-        "DEFAULT 'automatic'",
-      );
-      await seeded.customStatement(
-        'ALTER TABLE settings ADD COLUMN last_successful_tor_transport TEXT',
-      );
-      await seeded.close();
-
-      // Opening the app database runs the 14->15 migration. The _addColumnIfNot
-      // Exists guard must skip the duplicate tor adds instead of throwing, and
-      // still add the new screen-capture column.
-      final db = SqliteDatabase(schema.newConnection());
-      final columns = await db
-          .customSelect("SELECT name FROM pragma_table_info('settings')")
-          .map((row) => row.read<String>('name'))
-          .get();
-      expect(columns, contains('tor_transport_mode'));
-      expect(columns, contains('last_successful_tor_transport'));
-      expect(columns, contains('screen_capture_protection_enabled'));
-      await db.close();
-    },
-  );
 }