AMT-Cheif
/
drift
mirror of https://github.com/AMT-Cheif/drift.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix schema verifier around virtual tables

This commit is contained in:
Simon Binder 2021-12-01 21:06:16 +01:00
parent c844c86af4
commit 2999df449d
No known key found for this signature in database
GPG Key ID: 7891917E4147B8C0
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drift_dev/lib/src/services/schema/verifier_impl.dart
View File

@ -16,15 +16,21 @@ class VerifierImplementation implements SchemaVerifier {
@override @override
Future<void> migrateAndValidate(GeneratedDatabase db, int expectedVersion, Future<void> migrateAndValidate(GeneratedDatabase db, int expectedVersion,
{bool validateDropped = false}) async { {bool validateDropped = false}) async {
final virtualTables = <String>[
for (final table in db.allTables)
if (table is VirtualTableInfo) table.entityName,
];
// Open the database to collect its schema. Put a delegate in between // Open the database to collect its schema. Put a delegate in between
// claiming that the actual version is what we expect. // claiming that the actual version is what we expect.
await db.executor.ensureOpen(_DelegatingUser(expectedVersion, db)); await db.executor.ensureOpen(_DelegatingUser(expectedVersion, db));
final actualSchema = await db.executor.collectSchemaInput(); final actualSchema = await db.executor.collectSchemaInput(virtualTables);
// Open another connection to instantiate and extract the reference schema. // Open another connection to instantiate and extract the reference schema.
final otherConnection = await startAt(expectedVersion); final otherConnection = await startAt(expectedVersion);
await otherConnection.executor.ensureOpen(_DelegatingUser(expectedVersion)); await otherConnection.executor.ensureOpen(_DelegatingUser(expectedVersion));
final referenceSchema = await otherConnection.executor.collectSchemaInput(); final referenceSchema =
await otherConnection.executor.collectSchemaInput(virtualTables);
await otherConnection.executor.close(); await otherConnection.executor.close();
final result = final result =
@ -80,13 +86,16 @@ class VerifierImplementation implements SchemaVerifier {
} }
extension on QueryExecutor { extension on QueryExecutor {
Future<List<Input>> collectSchemaInput() async { Future<List<Input>> collectSchemaInput(List<String> virtualTables) async {
final result = await runSelect('SELECT * FROM sqlite_master;', const []); final result = await runSelect('SELECT * FROM sqlite_master;', const []);
final inputs = <Input>[]; final inputs = <Input>[];
for (final row in result) { for (final row in result) {
final name = row['name'] as String; final name = row['name'] as String;
// Skip sqlite-internal tables
if (name.startsWith('sqlite_autoindex')) continue; if (name.startsWith('sqlite_autoindex')) continue;
if (virtualTables.any((v) => name.startsWith('${v}_'))) continue;
inputs.add(Input(name, row['sql'] as String)); inputs.add(Input(name, row['sql'] as String));
} }

2
extras/migrations_example/README.md
View File

@ -19,5 +19,5 @@ Replace `_v2` with the current `schemaVersion`.
Run Run
``` ```
dart run drift_dev schema generate moor_migrations/ test/generated/ --data-classes --companions dart run drift_dev schema generate drift_migrations/ test/generated/ --data-classes --companions
``` ```