fix(storage): tolerate existing tor migration columns

Author: ethicnology

lib/core/storage/migrations/schema_14_to_15.dart

@@ -6,10 +6,19 @@ import 'package:drift/drift.dart';
 /// Adds the persisted Tor transport preferences to the settings table.
 class Schema14To15 {
   static Future<void> migrate(Migrator m, Schema15 schema15) async {
-    await m.addColumn(schema15.settings, schema15.settings.torTransportMode);
-    await m.addColumn(
-      schema15.settings,
-      schema15.settings.lastSuccessfulTorTransport,
-    );
+    final existingColumns = await m.database
+        .customSelect('PRAGMA table_info(settings)')
+        .map((row) => row.read<String>('name'))
+        .get();
+
+    if (!existingColumns.contains('tor_transport_mode')) {
+      await m.addColumn(schema15.settings, schema15.settings.torTransportMode);
+    }
+    if (!existingColumns.contains('last_successful_tor_transport')) {
+      await m.addColumn(
+        schema15.settings,
+        schema15.settings.lastSuccessfulTorTransport,
+      );
+    }
   }
 }

test/migrations_test/bull_database/schema_v14_to_v15_test.dart

@@ -42,4 +42,42 @@ void main() {
     expect(settings.single.lastSuccessfulTorTransport, isNull);
     await migratedDb.close();
   });
+
+  test('v14 to v15 preserves Tor columns from an unreleased develop v14', () async {
+    final schema = await verifier.schemaAt(14);
+    final oldDb = v14.DatabaseAtV14(schema.newConnection());
+    await oldDb
+        .into(oldDb.settings)
+        .insert(
+          v14.SettingsCompanion.insert(
+            environment: 'testnet',
+            bitcoinUnit: 'sats',
+            language: 'en',
+            currency: 'USD',
+            hideAmounts: 0,
+            isSuperuser: 0,
+          ),
+        );
+    await oldDb.customStatement(
+      "ALTER TABLE settings ADD COLUMN tor_transport_mode TEXT NOT NULL DEFAULT 'automatic'",
+    );
+    await oldDb.customStatement(
+      'ALTER TABLE settings ADD COLUMN last_successful_tor_transport TEXT NULL',
+    );
+    await oldDb.customStatement(
+      "UPDATE settings SET tor_transport_mode = 'socks5', last_successful_tor_transport = 'tor'",
+    );
+    await oldDb.close();
+
+    final db = SqliteDatabase(schema.newConnection());
+    await verifier.migrateAndValidate(db, 15);
+    await db.close();
+
+    final migratedDb = v15.DatabaseAtV15(schema.newConnection());
+    final settings = await migratedDb.select(migratedDb.settings).get();
+    expect(settings, hasLength(1));
+    expect(settings.single.torTransportMode, 'socks5');
+    expect(settings.single.lastSuccessfulTorTransport, 'tor');
+    await migratedDb.close();
+  });
 }