Sort imports in schema helper by version

Closes #3448
simolus3 · Feb 2, 2025 · bda5276 · bda5276
1 parent 087afb8
commit bda5276
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 28 deletions.
diff --git a/drift_dev/lib/src/cli/commands/make_migrations.dart b/drift_dev/lib/src/cli/commands/make_migrations.dart
@@ -344,7 +344,8 @@ ${blue.wrap("class")} ${green.wrap(dbClassName)} ${blue.wrap("extends")} ${green
               cli, version, entities, true, true);
     }
     writeTasks[File(p.join(testDatabasesDir.path, 'schema.dart'))] =
-        await GenerateUtils.generateLibraryCode(cli, schemas.keys);
+        await GenerateUtils.generateLibraryCode(
+            cli, schemas.keys.sorted((a, b) => a.compareTo(b)));
   }
 
   Future<void> writeTest() async {

diff --git a/examples/app/test/drift/default/generated/schema.dart b/examples/app/test/drift/default/generated/schema.dart
@@ -3,20 +3,20 @@
 // ignore_for_file: type=lint
 import 'package:drift/drift.dart';
 import 'package:drift/internal/migrations.dart';
-import 'schema_v3.dart' as v3;
-import 'schema_v2.dart' as v2;
 import 'schema_v1.dart' as v1;
+import 'schema_v2.dart' as v2;
+import 'schema_v3.dart' as v3;
 
 class GeneratedHelper implements SchemaInstantiationHelper {
   @override
   GeneratedDatabase databaseForVersion(QueryExecutor db, int version) {
     switch (version) {
-      case 3:
-        return v3.DatabaseAtV3(db);
-      case 2:
-        return v2.DatabaseAtV2(db);
       case 1:
         return v1.DatabaseAtV1(db);
+      case 2:
+        return v2.DatabaseAtV2(db);
+      case 3:
+        return v3.DatabaseAtV3(db);
       default:
         throw MissingSchemaException(version, versions);
     }

diff --git a/examples/migrations_example/test/drift/default/generated/schema.dart b/examples/migrations_example/test/drift/default/generated/schema.dart
@@ -3,44 +3,44 @@
 // ignore_for_file: type=lint
 import 'package:drift/drift.dart';
 import 'package:drift/internal/migrations.dart';
-import 'schema_v9.dart' as v9;
-import 'schema_v5.dart' as v5;
+import 'schema_v1.dart' as v1;
+import 'schema_v2.dart' as v2;
+import 'schema_v3.dart' as v3;
 import 'schema_v4.dart' as v4;
+import 'schema_v5.dart' as v5;
+import 'schema_v6.dart' as v6;
+import 'schema_v7.dart' as v7;
 import 'schema_v8.dart' as v8;
-import 'schema_v3.dart' as v3;
+import 'schema_v9.dart' as v9;
 import 'schema_v10.dart' as v10;
 import 'schema_v11.dart' as v11;
-import 'schema_v2.dart' as v2;
-import 'schema_v1.dart' as v1;
-import 'schema_v7.dart' as v7;
-import 'schema_v6.dart' as v6;
 
 class GeneratedHelper implements SchemaInstantiationHelper {
   @override
   GeneratedDatabase databaseForVersion(QueryExecutor db, int version) {
     switch (version) {
-      case 9:
-        return v9.DatabaseAtV9(db);
-      case 5:
-        return v5.DatabaseAtV5(db);
+      case 1:
+        return v1.DatabaseAtV1(db);
+      case 2:
+        return v2.DatabaseAtV2(db);
+      case 3:
+        return v3.DatabaseAtV3(db);
       case 4:
         return v4.DatabaseAtV4(db);
+      case 5:
+        return v5.DatabaseAtV5(db);
+      case 6:
+        return v6.DatabaseAtV6(db);
+      case 7:
+        return v7.DatabaseAtV7(db);
       case 8:
         return v8.DatabaseAtV8(db);
-      case 3:
-        return v3.DatabaseAtV3(db);
+      case 9:
+        return v9.DatabaseAtV9(db);
       case 10:
         return v10.DatabaseAtV10(db);
       case 11:
         return v11.DatabaseAtV11(db);
-      case 2:
-        return v2.DatabaseAtV2(db);
-      case 1:
-        return v1.DatabaseAtV1(db);
-      case 7:
-        return v7.DatabaseAtV7(db);
-      case 6:
-        return v6.DatabaseAtV6(db);
       default:
         throw MissingSchemaException(version, versions);
     }