Skip to content

Commit 3ae842f

Browse files
committed
fix: drop unused dismissed_announcements table from v14 migration
1 parent 7618093 commit 3ae842f

7 files changed

Lines changed: 0 additions & 378 deletions

File tree

lib/core/storage/migrations/schema_13_to_14.dart

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'package:bb_mobile/core/storage/sqlite_database.steps.dart';
2-
import 'package:bb_mobile/core/utils/logger.dart';
32
import 'package:drift/drift.dart';
43

54
/// Migration from version 13 to 14
@@ -26,10 +25,6 @@ import 'package:drift/drift.dart';
2625
/// expiry with an original available) — see PayjoinStatus.aborted.
2726
/// Previously this outcome was folded into 'is_completed', which made
2827
/// every plain fallback broadcast display as a completed payjoin.
29-
///
30-
/// Adds the dismissed_announcements table:
31-
/// - Records which home announcements the user has dismissed (announcement id
32-
/// + dismissal timestamp). New table, created empty.
3328
class Schema13To14 {
3429
static Future<void> migrate(Migrator m, Schema14 schema14) async {
3530
try {
@@ -70,21 +65,5 @@ class Schema13To14 {
7065
} catch (e) {
7166
if (!e.toString().contains('duplicate column')) rethrow;
7267
}
73-
74-
// New dismissed_announcements table: one row per home announcement the
75-
// user has dismissed (announcement id + dismissal timestamp). A brand-new
76-
// table, so existing installs simply start with zero dismissals.
77-
try {
78-
await m.createTable(schema14.dismissedAnnouncements);
79-
} catch (e) {
80-
// Idempotency guard: only swallow "table already exists" (a re-run over a
81-
// partially-applied migration) — log it so a driver wording change
82-
// surfaces instead of silently becoming a hard failure.
83-
if (!e.toString().contains('already exists')) rethrow;
84-
log.warning(
85-
'Schema13To14: dismissed_announcements already exists — skipping create',
86-
error: e,
87-
);
88-
}
8968
}
9069
}

lib/core/storage/schemas/bull_database/drift_schema_v14.json

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2038,43 +2038,6 @@
20382038
"vout"
20392039
]
20402040
}
2041-
},
2042-
{
2043-
"id": 16,
2044-
"references": [],
2045-
"type": "table",
2046-
"data": {
2047-
"name": "dismissed_announcements",
2048-
"was_declared_in_moor": false,
2049-
"columns": [
2050-
{
2051-
"name": "announcement_id",
2052-
"getter_name": "announcementId",
2053-
"moor_type": "string",
2054-
"nullable": false,
2055-
"customConstraints": null,
2056-
"default_dart": null,
2057-
"default_client_dart": null,
2058-
"dsl_features": []
2059-
},
2060-
{
2061-
"name": "dismissed_at",
2062-
"getter_name": "dismissedAt",
2063-
"moor_type": "dateTime",
2064-
"nullable": false,
2065-
"customConstraints": null,
2066-
"default_dart": null,
2067-
"default_client_dart": null,
2068-
"dsl_features": []
2069-
}
2070-
],
2071-
"is_virtual": false,
2072-
"without_rowid": false,
2073-
"constraints": [],
2074-
"explicit_pk": [
2075-
"announcement_id"
2076-
]
2077-
}
20782041
}
20792042
],
20802043
"fixed_sql": [
@@ -2221,15 +2184,6 @@
22212184
"sql": "CREATE TABLE IF NOT EXISTS \"frozen_utxos\" (\"wallet_id\" TEXT NOT NULL, \"tx_id\" TEXT NOT NULL, \"vout\" INTEGER NOT NULL, PRIMARY KEY (\"wallet_id\", \"tx_id\", \"vout\"));"
22222185
}
22232186
]
2224-
},
2225-
{
2226-
"name": "dismissed_announcements",
2227-
"sql": [
2228-
{
2229-
"dialect": "sqlite",
2230-
"sql": "CREATE TABLE IF NOT EXISTS \"dismissed_announcements\" (\"announcement_id\" TEXT NOT NULL, \"dismissed_at\" TEXT NOT NULL, PRIMARY KEY (\"announcement_id\"));"
2231-
}
2232-
]
22332187
}
22342188
]
22352189
}

lib/core/storage/sqlite_database.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import 'package:bb_mobile/core/utils/logger.dart';
77
import 'package:bb_mobile/core/utils/report.dart';
88
import 'package:bb_mobile/core/storage/tables/auto_swap.dart';
99
import 'package:bb_mobile/core/storage/tables/bip85_derivations_table.dart';
10-
import 'package:bb_mobile/core/storage/tables/dismissed_announcements_table.dart';
1110
import 'package:bb_mobile/core/storage/tables/electrum_servers_table.dart';
1211
import 'package:bb_mobile/core/storage/tables/electrum_settings_table.dart';
1312
import 'package:bb_mobile/core/storage/tables/frozen_utxos_table.dart';
@@ -50,7 +49,6 @@ part 'sqlite_database.g.dart';
5049
Recoverbull,
5150
Prices,
5251
FrozenUtxos,
53-
DismissedAnnouncements,
5452
],
5553
)
5654
class SqliteDatabase extends _$SqliteDatabase {

lib/core/storage/sqlite_database.steps.dart

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6270,7 +6270,6 @@ final class Schema14 extends i0.VersionedSchema {
62706270
recoverbull,
62716271
prices,
62726272
frozenUtxos,
6273-
dismissedAnnouncements,
62746273
];
62756274
late final Shape0 transactions = Shape0(
62766275
source: i0.VersionedTable(
@@ -6611,17 +6610,6 @@ final class Schema14 extends i0.VersionedSchema {
66116610
),
66126611
alias: null,
66136612
);
6614-
late final Shape43 dismissedAnnouncements = Shape43(
6615-
source: i0.VersionedTable(
6616-
entityName: 'dismissed_announcements',
6617-
withoutRowId: false,
6618-
isStrict: false,
6619-
tableConstraints: ['PRIMARY KEY(announcement_id)'],
6620-
columns: [_column_246, _column_247],
6621-
attachedDatabase: database,
6622-
),
6623-
alias: null,
6624-
);
66256613
}
66266614

66276615
class Shape40 extends i0.VersionedTable {
@@ -6773,30 +6761,6 @@ class Shape42 extends i0.VersionedTable {
67736761
columnsByName['is_aborted']! as i1.GeneratedColumn<int>;
67746762
}
67756763

6776-
class Shape43 extends i0.VersionedTable {
6777-
Shape43({required super.source, required super.alias}) : super.aliased();
6778-
i1.GeneratedColumn<String> get announcementId =>
6779-
columnsByName['announcement_id']! as i1.GeneratedColumn<String>;
6780-
i1.GeneratedColumn<String> get dismissedAt =>
6781-
columnsByName['dismissed_at']! as i1.GeneratedColumn<String>;
6782-
}
6783-
6784-
i1.GeneratedColumn<String> _column_246(String aliasedName) =>
6785-
i1.GeneratedColumn<String>(
6786-
'announcement_id',
6787-
aliasedName,
6788-
false,
6789-
type: i1.DriftSqlType.string,
6790-
$customConstraints: 'NOT NULL',
6791-
);
6792-
i1.GeneratedColumn<String> _column_247(String aliasedName) =>
6793-
i1.GeneratedColumn<String>(
6794-
'dismissed_at',
6795-
aliasedName,
6796-
false,
6797-
type: i1.DriftSqlType.string,
6798-
$customConstraints: 'NOT NULL',
6799-
);
68006764
i0.MigrationStepWithVersion migrationSteps({
68016765
required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
68026766
required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,

lib/core/storage/tables/dismissed_announcements_table.dart

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)