Fix tests of main package, imports in dev

drift/test/batch_test.dart

@@ -1,5 +1,5 @@
+import 'package:drift/drift.dart';
 import 'package:mockito/mockito.dart';
-import 'package:moor/moor.dart';
 import 'package:test/test.dart';
 
 import 'data/tables/todos.dart';

drift/test/columns/datetime_test.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
 import 'package:test/test.dart';
 
 void main() {

drift/test/columns/int_column_test.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
 import 'package:test/test.dart';
 
 import '../data/tables/todos.dart';

drift/test/custom_queries_test.dart

@@ -1,5 +1,5 @@
+import 'package:drift/drift.dart';
 import 'package:mockito/mockito.dart';
-import 'package:moor/moor.dart';
 import 'package:test/test.dart';
 
 import 'data/tables/todos.dart';

drift/test/data/tables/converter.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
 
 enum SyncType {
   locallyCreated,

drift/test/data/tables/custom_tables.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
 
 import 'converter.dart';
 import 'data_classes.dart';
@@ -7,7 +7,7 @@ export 'data_classes.dart';
 
 part 'custom_tables.g.dart';
 
-@UseMoor(
+@DriftDatabase(
   include: {'tables.moor'},
   queries: {
     'writeConfig': 'REPLACE INTO config (config_key, config_value) '
@@ -16,7 +16,7 @@ part 'custom_tables.g.dart';
 )
 class CustomTablesDb extends _$CustomTablesDb {
   CustomTablesDb(QueryExecutor e) : super(e) {
-    moorRuntimeOptions.dontWarnAboutMultipleDatabases = true;
+    driftRuntimeOptions.dontWarnAboutMultipleDatabases = true;
   }
 
   @override

drift/test/data/tables/todos.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
 // ignore: import_of_legacy_library_into_null_safe
 import 'package:uuid/uuid.dart';
 
@@ -121,7 +121,7 @@ class CustomConverter extends TypeConverter<MyCustomObject, String> {
   }
 }
 
-@UseMoor(
+@DriftDatabase(
   tables: [
     TodosTable,
     Categories,
@@ -143,11 +143,11 @@ class CustomConverter extends TypeConverter<MyCustomObject, String> {
 )
 class TodoDb extends _$TodoDb {
   TodoDb([QueryExecutor? e]) : super(e ?? const NullExecutor()) {
-    moorRuntimeOptions.dontWarnAboutMultipleDatabases = true;
+    driftRuntimeOptions.dontWarnAboutMultipleDatabases = true;
   }
 
   TodoDb.connect(DatabaseConnection connection) : super.connect(connection) {
-    moorRuntimeOptions.dontWarnAboutMultipleDatabases = true;
+    driftRuntimeOptions.dontWarnAboutMultipleDatabases = true;
   }
 
   @override
@@ -157,7 +157,7 @@ class TodoDb extends _$TodoDb {
   int get schemaVersion => 1;
 }
 
-@UseDao(
+@DriftAccessor(
   tables: [Users, SharedTodos, TodosTable],
   queries: {
     'todosForUser': 'SELECT t.* FROM todos t '

drift/test/data/utils/expect_generated.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
 import 'package:test/test.dart';
 
 /// Matcher for [Component]-subclasses. Expect that a component generates the

drift/test/data/utils/mocks.dart

@@ -1,8 +1,8 @@
 import 'dart:async';
 
+import 'package:drift/drift.dart';
+import 'package:drift/src/runtime/executor/stream_queries.dart';
 import 'package:mockito/mockito.dart';
-import 'package:moor/moor.dart';
-import 'package:moor/src/runtime/executor/stream_queries.dart';
 
 class MockExecutor extends Mock implements QueryExecutor {
   late final MockTransactionExecutor transactions = MockTransactionExecutor();

drift/test/data/utils/null_executor.dart

@@ -1,4 +1,4 @@
-import 'package:moor/backends.dart';
+import 'package:drift/backends.dart';
 
 class NullExecutor implements QueryExecutor {
   const NullExecutor();

drift/test/data_class_test.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
 import 'package:test/test.dart';
 
 import 'data/tables/todos.dart';
@@ -32,8 +32,8 @@ void main() {
     });
 
     test('can be overridden globally', () {
-      final old = moorRuntimeOptions.defaultSerializer;
-      moorRuntimeOptions.defaultSerializer = _MySerializer();
+      final old = driftRuntimeOptions.defaultSerializer;
+      driftRuntimeOptions.defaultSerializer = _MySerializer();
 
       final entry = TodoEntry(
         id: 13,
@@ -53,7 +53,7 @@ void main() {
         },
       );
 
-      moorRuntimeOptions.defaultSerializer = old;
+      driftRuntimeOptions.defaultSerializer = old;
     });
 
     test('can serialize and deserialize blob columns', () {

drift/test/database_test.dart

@@ -1,5 +1,5 @@
+import 'package:drift/drift.dart';
 import 'package:mockito/mockito.dart';
-import 'package:moor/moor.dart';
 import 'package:test/test.dart';
 
 import 'data/tables/todos.dart';
@@ -33,7 +33,7 @@ class _FakeDb extends GeneratedDatabase {
 }
 
 void main() {
-  moorRuntimeOptions.dontWarnAboutMultipleDatabases = true;
+  driftRuntimeOptions.dontWarnAboutMultipleDatabases = true;
 
   test('status of OpeningDetails', () {
     expect(const OpeningDetails(null, 1).wasCreated, true);

drift/test/delete_test.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
+import 'package:drift/drift.dart';
 import 'package:mockito/mockito.dart';
-import 'package:moor/moor.dart';
 import 'package:test/test.dart';
 
 import 'data/tables/todos.dart';

drift/test/engines/connection_pool_integration_test.dart

@@ -1,9 +1,9 @@
 @TestOn('vm')
 import 'dart:io';
 
-import 'package:moor/ffi.dart';
-import 'package:moor/isolate.dart';
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
+import 'package:drift/isolate.dart';
+import 'package:drift/native.dart';
 import 'package:path/path.dart' show join;
 import 'package:test/test.dart';
 
@@ -12,7 +12,7 @@ import '../data/tables/todos.dart';
 String fileName = 'moor-wal-integration-test.db';
 final _file = File(join(Directory.systemTemp.path, fileName));
 
-QueryExecutor _createExecutor() => VmDatabase(_file);
+QueryExecutor _createExecutor() => NativeDatabase(_file);
 
 DatabaseConnection _forBackgroundIsolate() {
   return DatabaseConnection.fromExecutor(_createExecutor());
@@ -26,7 +26,7 @@ void main() {
   });
 
   test('can use a multi-executor setup', () async {
-    final isolate = await MoorIsolate.spawn(_forBackgroundIsolate);
+    final isolate = await DriftIsolate.spawn(_forBackgroundIsolate);
 
     // create an executor that runs selects in this isolate and writes in
     // another isolate.

drift/test/engines/connection_pool_test.dart

@@ -1,5 +1,5 @@
+import 'package:drift/drift.dart';
 import 'package:mockito/mockito.dart';
-import 'package:moor/moor.dart';
 import 'package:test/test.dart';
 
 import '../data/tables/todos.dart';

drift/test/engines/delegated_database_test.dart

@@ -1,7 +1,7 @@
 //@dart=2.9
+import 'package:drift/backends.dart';
+import 'package:drift/drift.dart';
 import 'package:mockito/mockito.dart';
-import 'package:moor/backends.dart';
-import 'package:moor/moor.dart';
 import 'package:test/test.dart';
 
 class _MockDelegate extends Mock implements DatabaseDelegate {}

drift/test/error_handling_test.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
 import 'package:test/test.dart';
 
 import 'data/tables/todos.dart';

drift/test/expressions/aggregate_test.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
 import 'package:test/test.dart';
 
 import '../data/utils/expect_generated.dart';

drift/test/expressions/algebra_test.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
 import 'package:test/test.dart';
 
 import '../data/utils/expect_equality.dart';

drift/test/expressions/bools_test.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
 import 'package:test/test.dart';
 
 import '../data/utils/expect_equality.dart';

drift/test/expressions/comparable_test.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
 import 'package:test/test.dart';
 
 import '../data/tables/todos.dart';

drift/test/expressions/constant_test.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
 import 'package:test/test.dart';
 
 import '../data/tables/todos.dart';

drift/test/expressions/datetime_expression_test.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
 import 'package:test/test.dart';
 
 import '../data/utils/expect_equality.dart';

drift/test/expressions/exists_test.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
 import 'package:test/test.dart';
 
 import '../data/tables/todos.dart';

drift/test/expressions/expression_test.dart

@@ -1,5 +1,5 @@
+import 'package:drift/drift.dart';
 import 'package:mockito/mockito.dart';
-import 'package:moor/moor.dart';
 import 'package:test/test.dart';
 
 import '../data/tables/custom_tables.dart';

drift/test/expressions/expressions_integration_test.dart

@@ -1,6 +1,6 @@
 @TestOn('vm')
-import 'package:moor/ffi.dart';
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
+import 'package:drift/native.dart';
 import 'package:test/test.dart';
 
 import '../data/tables/todos.dart';
@@ -9,7 +9,7 @@ void main() {
   late TodoDb db;
 
   setUp(() async {
-    db = TodoDb(VmDatabase.memory());
+    db = TodoDb(NativeDatabase.memory());
 
     // we selectOnly from users for the lack of a better option. Insert one
     // row so that getSingle works

drift/test/expressions/in_expression_test.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
 import 'package:test/test.dart';
 
 import '../data/tables/todos.dart';

drift/test/expressions/null_check_test.dart

@@ -1,5 +1,5 @@
-import 'package:moor/moor.dart';
-import 'package:moor/moor.dart' as moor;
+import 'package:drift/drift.dart';
+import 'package:drift/drift.dart' as moor;
 import 'package:test/test.dart';
 
 import '../data/utils/expect_equality.dart';

drift/test/expressions/text_test.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
 import 'package:test/test.dart';
 
 import '../data/tables/todos.dart';

drift/test/expressions/variable_test.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
 import 'package:test/test.dart';
 
 import '../data/tables/todos.dart';

drift/test/expressions/when_test.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
 import 'package:test/test.dart';
 
 import '../data/utils/expect_generated.dart';

drift/test/extensions/fts5_integration_test.dart

@@ -1,13 +1,13 @@
 @Tags(['integration'])
 @TestOn('vm')
-import 'package:moor/ffi.dart';
+import 'package:drift/native.dart';
 import 'package:test/test.dart';
 
 import '../data/tables/custom_tables.dart';
 
 void main() {
   test('fts5 integration test', () async {
-    final db = CustomTablesDb(VmDatabase.memory());
+    final db = CustomTablesDb(NativeDatabase.memory());
 
     await db.into(db.email).insert(EmailCompanion.insert(
         sender: 'foo@example.org', title: 'Hello world', body: 'Test email'));

drift/test/extensions/json1_integration_test.dart

@@ -2,16 +2,16 @@
 @TestOn('vm')
 import 'dart:convert';
 
-import 'package:moor/extensions/json1.dart';
-import 'package:moor/ffi.dart';
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
+import 'package:drift/extensions/json1.dart';
+import 'package:drift/native.dart';
 import 'package:test/test.dart';
 
 import '../data/tables/todos.dart';
 
 void main() {
   test('json1 integration test', () async {
-    final db = TodoDb(VmDatabase.memory());
+    final db = TodoDb(NativeDatabase.memory());
     const jsonObject = {
       'foo': 'bar',
       'array': [

drift/test/extensions/json1_test.dart

@@ -1,5 +1,5 @@
-import 'package:moor/extensions/json1.dart';
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
+import 'package:drift/extensions/json1.dart';
 import 'package:test/test.dart';
 
 import '../data/utils/expect_generated.dart';

drift/test/extensions/moor_ffi_functions_test.dart

@@ -1,7 +1,7 @@
-import 'package:moor/extensions/moor_ffi.dart';
-import 'package:moor/ffi.dart';
 @TestOn('vm')
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
+import 'package:drift/extensions/native.dart';
+import 'package:drift/native.dart';
 import 'package:test/test.dart';
 
 import '../data/tables/todos.dart';
@@ -34,7 +34,7 @@ void main() {
   });
 
   test('containsCase integration test', () async {
-    final db = TodoDb(VmDatabase.memory());
+    final db = TodoDb(NativeDatabase.memory());
     // insert exactly one row so that we can evaluate expressions from Dart
     await db.into(db.pureDefaults).insert(PureDefaultsCompanion.insert());
 
@@ -61,7 +61,7 @@ void main() {
     late TodoDb db;
 
     setUp(() async {
-      db = TodoDb(VmDatabase.memory());
+      db = TodoDb(NativeDatabase.memory());
       // insert exactly one row so that we can evaluate expressions from Dart
       await db.into(db.pureDefaults).insert(PureDefaultsCompanion.insert());
     });

drift/test/ffi/close_existing_test.dart

@@ -1,8 +1,8 @@
 @TestOn('vm')
 import 'dart:io';
 
-import 'package:moor/ffi.dart';
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
+import 'package:drift/native.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
@@ -12,15 +12,15 @@ void main() {
     if (file.existsSync()) file.deleteSync();
 
     // Create the first database holding the lock
-    final db1 = VmDatabase(file);
+    final db1 = NativeDatabase(file);
     await db1.ensureOpen(_NullUser());
     await db1.runCustom('BEGIN EXCLUSIVE');
 
     // Close instances indirectly (we don't close db1)
-    VmDatabase.closeExistingInstances();
+    NativeDatabase.closeExistingInstances();
 
     // Now open a second instance, it should be able to start a transactions
-    final db2 = VmDatabase(file);
+    final db2 = NativeDatabase(file);
     await db2.ensureOpen(_NullUser());
     await db2.runCustom('BEGIN EXCLUSIVE');
     await db2.runCustom('COMMIT');

drift/test/ffi/moor_functions_test.dart

@@ -1,7 +1,7 @@
 @TestOn('vm')
 import 'dart:math';
 
-import 'package:moor/src/ffi/moor_ffi_functions.dart';
+import 'package:drift/src/ffi/moor_ffi_functions.dart';
 import 'package:sqlite3/sqlite3.dart';
 import 'package:test/test.dart';
 

drift/test/ffi/setup_test.dart

@@ -1,5 +1,5 @@
 @TestOn('vm')
-import 'package:moor/ffi.dart';
+import 'package:drift/native.dart';
 import 'package:sqlite3/sqlite3.dart';
 import 'package:test/test.dart';
 
@@ -14,7 +14,7 @@ void _setup(Database db) {
 
 void main() {
   test('can use a custom setup function', () async {
-    final executor = VmDatabase.memory(setup: _setup);
+    final executor = NativeDatabase.memory(setup: _setup);
 
     final db = TodoDb(executor);
     final row = await db.customSelect('SELECT my_function() AS r;').getSingle();
@@ -25,7 +25,7 @@ void main() {
 
   test('custom setup is called for existing databases', () async {
     final existing = sqlite3.openInMemory();
-    final executor = VmDatabase.opened(existing, setup: _setup);
+    final executor = NativeDatabase.opened(existing, setup: _setup);
     // Needs to be false so that we can run migrations
     expect(executor.delegate.isOpen, completion(isFalse));
 

drift/test/ffi/vm_database_test.dart

@@ -1,5 +1,5 @@
-import 'package:moor/ffi.dart';
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
+import 'package:drift/native.dart';
 import 'package:sqlite3/sqlite3.dart';
 import 'package:test/test.dart';
 
@@ -7,7 +7,7 @@ void main() {
   group('VmDatabase.opened', () {
     test('disposes the underlying database by default', () async {
       final underlying = sqlite3.openInMemory();
-      final db = VmDatabase.opened(underlying);
+      final db = NativeDatabase.opened(underlying);
       await db.ensureOpen(_FakeExecutorUser());
       await db.close();
 
@@ -16,7 +16,8 @@ void main() {
 
     test('can avoid disposing the underlying instance', () async {
       final underlying = sqlite3.openInMemory();
-      final db = VmDatabase.opened(underlying, closeUnderlyingOnClose: false);
+      final db =
+          NativeDatabase.opened(underlying, closeUnderlyingOnClose: false);
       await db.ensureOpen(_FakeExecutorUser());
       await db.close();
 

drift/test/insert_test.dart

@@ -1,5 +1,5 @@
+import 'package:drift/drift.dart';
 import 'package:mockito/mockito.dart';
-import 'package:moor/moor.dart';
 import 'package:test/test.dart';
 
 import 'data/tables/todos.dart';

drift/test/integration_tests/cancellation_test.dart

@@ -1,7 +1,7 @@
 @Tags(['integration'])
-import 'package:moor/ffi.dart';
-import 'package:moor/isolate.dart';
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
+import 'package:drift/isolate.dart';
+import 'package:drift/native.dart';
 import 'package:rxdart/rxdart.dart';
 import 'package:test/test.dart';
 
@@ -10,7 +10,7 @@ DatabaseConnection createConnection() {
   final loggedValues = <int>[];
 
   return DatabaseConnection.fromExecutor(
-    VmDatabase.memory(
+    NativeDatabase.memory(
       setup: (rawDb) {
         rawDb.createFunction(
           functionName: 'increment_counter',
@@ -47,7 +47,7 @@ class EmptyDb extends GeneratedDatabase {
 }
 
 void main() {
-  moorRuntimeOptions.dontWarnAboutMultipleDatabases = true;
+  driftRuntimeOptions.dontWarnAboutMultipleDatabases = true;
 
   Future<void> runTest(EmptyDb db) async {
     String slowQuery(int i) => '''
@@ -77,7 +77,7 @@ void main() {
 
   group('stream queries are aborted on cancellations', () {
     test('on a background isolate', () async {
-      final isolate = await MoorIsolate.spawn(createConnection);
+      final isolate = await DriftIsolate.spawn(createConnection);
       addTearDown(isolate.shutdownAll);
 
       final db = EmptyDb.connect(await isolate.connect());
@@ -91,7 +91,7 @@ void main() {
       select $i from slow;
     ''';
 
-    final isolate = await MoorIsolate.spawn(createConnection);
+    final isolate = await DriftIsolate.spawn(createConnection);
     addTearDown(isolate.shutdownAll);
 
     final db = EmptyDb.connect(await isolate.connect());

drift/test/integration_tests/insert_integration_test.dart

@@ -1,6 +1,6 @@
-import 'package:moor/ffi.dart';
 @TestOn('vm')
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
+import 'package:drift/native.dart';
 import 'package:test/test.dart';
 
 import '../data/tables/todos.dart';
@@ -10,7 +10,7 @@ void main() {
   late TodoDb db;
 
   setUp(() {
-    db = TodoDb(VmDatabase.memory());
+    db = TodoDb(NativeDatabase.memory());
   });
 
   test('insertOnConflictUpdate', () async {

drift/test/integration_tests/migrations_integration_test.dart

@@ -1,6 +1,6 @@
 @TestOn('vm')
-import 'package:moor/ffi.dart';
-import 'package:moor/moor.dart' hide isNull;
+import 'package:drift/drift.dart' hide isNull;
+import 'package:drift/native.dart';
 import 'package:sqlite3/sqlite3.dart';
 import 'package:test/test.dart';
 
@@ -10,7 +10,7 @@ import '../data/tables/todos.dart';
 void main() {
   test('change column types', () async {
     // Create todos table with category as text (it's an int? in Dart).
-    final executor = VmDatabase.memory(setup: (db) {
+    final executor = NativeDatabase.memory(setup: (db) {
       db.execute('''
         CREATE TABLE todos (
           id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -62,7 +62,7 @@ void main() {
 
   test('rename columns', () async {
     // Create todos table with category as category_old
-    final executor = VmDatabase.memory(setup: (db) {
+    final executor = NativeDatabase.memory(setup: (db) {
       db.execute('''
         CREATE TABLE todos (
           id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -107,7 +107,7 @@ void main() {
 
   test('delete column', () async {
     // Create todos table with an additional column
-    final executor = VmDatabase.memory(setup: (db) {
+    final executor = NativeDatabase.memory(setup: (db) {
       db.execute('''
         CREATE TABLE todos (
           id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -146,7 +146,7 @@ void main() {
 
   test('rename tables', () async {
     // Create todos table with old name
-    final executor = VmDatabase.memory(setup: (db) {
+    final executor = NativeDatabase.memory(setup: (db) {
       db.execute('''
         CREATE TABLE todos_old_name (
           id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -175,7 +175,7 @@ void main() {
   });
 
   test('add columns with default value', () async {
-    final executor = VmDatabase.memory(setup: (db) {
+    final executor = NativeDatabase.memory(setup: (db) {
       // Create todos table without content column
       db.execute('''
         CREATE TABLE todos (
@@ -215,7 +215,7 @@ void main() {
   });
 
   test('alter table without rowid', () async {
-    final executor = VmDatabase.memory(setup: (db) {
+    final executor = NativeDatabase.memory(setup: (db) {
       db.execute(
           'CREATE TABLE no_ids (old BLOB NOT NULL PRIMARY KEY) WITHOUT ROWID');
     });
@@ -244,7 +244,7 @@ void main() {
     test('do not change the user version', () async {
       final nativeDb = sqlite3.openInMemory();
       final db = _TestDatabase(
-        VmDatabase.opened(nativeDb),
+        NativeDatabase.opened(nativeDb),
         1,
         MigrationStrategy(onCreate: (m) => Future.error('do not migrate')),
       );
@@ -258,7 +258,7 @@ void main() {
         () async {
       final nativeDb = sqlite3.openInMemory();
       var db = _TestDatabase(
-        VmDatabase.opened(nativeDb, closeUnderlyingOnClose: false),
+        NativeDatabase.opened(nativeDb, closeUnderlyingOnClose: false),
         1,
         MigrationStrategy(),
       );
@@ -266,7 +266,7 @@ void main() {
       await db.close();
 
       db = _TestDatabase(
-        VmDatabase.opened(nativeDb),
+        NativeDatabase.opened(nativeDb),
         2,
         MigrationStrategy(
           onCreate: (m) => Future.error('Should not call onCreate'),
@@ -290,13 +290,13 @@ void main() {
     test('can set user version in callback', () async {
       final nativeDb = sqlite3.openInMemory();
       var db = _TestDatabase(
-          VmDatabase.opened(nativeDb, closeUnderlyingOnClose: false),
+          NativeDatabase.opened(nativeDb, closeUnderlyingOnClose: false),
           1,
           MigrationStrategy());
       await db.doWhenOpened((e) {});
 
       db = _TestDatabase(
-        VmDatabase.opened(nativeDb),
+        NativeDatabase.opened(nativeDb),
         10,
         MigrationStrategy(
           onCreate: (m) => Future.error('Should not call onCreate'),

drift/test/integration_tests/moor_files_integration_test.dart

@@ -1,5 +1,5 @@
-import 'package:moor/ffi.dart';
-import 'package:moor/moor.dart' hide isNull;
+import 'package:drift/drift.dart' hide isNull;
+import 'package:drift/native.dart';
 import 'package:test/test.dart';
 
 import '../data/tables/converter.dart';
@@ -7,11 +7,11 @@ import '../data/tables/custom_tables.dart';
 import '../skips.dart';
 
 void main() {
-  late VmDatabase executor;
+  late NativeDatabase executor;
   late CustomTablesDb db;
 
   setUp(() {
-    executor = VmDatabase.memory();
+    executor = NativeDatabase.memory();
     db = CustomTablesDb(executor);
   });
 

drift/test/integration_tests/moor_files_test.dart

@@ -1,5 +1,5 @@
+import 'package:drift/drift.dart';
 import 'package:mockito/mockito.dart';
-import 'package:moor/moor.dart';
 import 'package:test/test.dart';
 
 import '../data/tables/converter.dart';

drift/test/integration_tests/regress_1232_test.dart

@@ -1,6 +1,6 @@
 @TestOn('vm')
-import 'package:moor/ffi.dart';
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
+import 'package:drift/native.dart';
 import 'package:test/test.dart';
 
 import '../data/tables/todos.dart';
@@ -8,7 +8,7 @@ import '../data/tables/todos.dart';
 void main() {
   test('regression test for #1232', () async {
     // replace with generated table
-    final db = TodoDb(VmDatabase.memory());
+    final db = TodoDb(NativeDatabase.memory());
     final someTables = {db.todosTable};
 
     await db.customStatement('create table tbl (x int)');

drift/test/integration_tests/regress_1235_test.dart

@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:moor/ffi.dart';
+import 'package:drift/native.dart';
 import 'package:test/scaffolding.dart';
 
 import '../data/tables/todos.dart';
@@ -10,7 +10,7 @@ void main() {
     // See https://github.com/simolus3/moor/issues/1235. We shouldn't run async
     // work without users being aware of it, and no one expects creating an
     // instance to schedule new microtasks.
-    noAsync(() => TodoDb(VmDatabase.memory()));
+    noAsync(() => TodoDb(NativeDatabase.memory()));
   });
 }
 

drift/test/integration_tests/regress_1442_test.dart

@@ -1,12 +1,13 @@
 @TestOn('vm')
 import 'dart:async';
 
-import 'package:moor/ffi.dart';
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
+import 'package:drift/native.dart';
 import 'package:test/test.dart';
 
 class _TestDb extends GeneratedDatabase {
-  _TestDb() : super(const SqlTypeSystem.withDefaults(), VmDatabase.memory());
+  _TestDb()
+      : super(const SqlTypeSystem.withDefaults(), NativeDatabase.memory());
   @override
   final List<TableInfo> allTables = const [];
   @override

drift/test/isolate_test.dart

@@ -2,9 +2,9 @@
 import 'dart:async';
 import 'dart:isolate';
 
-import 'package:moor/ffi.dart';
-import 'package:moor/isolate.dart';
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
+import 'package:drift/isolate.dart';
+import 'package:drift/native.dart';
 import 'package:test/test.dart';
 
 import 'data/tables/todos.dart';
@@ -14,16 +14,16 @@ void main() {
   // is pointless, but we can't collect coverage for background isolates:
   // https://github.com/dart-lang/test/issues/1108
   group('in same isolate', () {
-    MoorIsolate spawnInSame() {
-      return MoorIsolate.inCurrent(_backgroundConnection);
+    DriftIsolate spawnInSame() {
+      return DriftIsolate.inCurrent(_backgroundConnection);
     }
 
     _runTests(spawnInSame, false);
   });
 
   group('in background isolate', () {
-    Future<MoorIsolate> spawnBackground() {
-      return MoorIsolate.spawn(_backgroundConnection);
+    Future<DriftIsolate> spawnBackground() {
+      return DriftIsolate.spawn(_backgroundConnection);
     }
 
     _runTests(spawnBackground, true);
@@ -34,7 +34,7 @@ void main() {
     // 1. this one, starting a query stream
     // 2. another one running an insert
     // 3. the MoorIsolate executor the other two are connecting to
-    final moorIsolate = await MoorIsolate.spawn(_backgroundConnection);
+    final moorIsolate = await DriftIsolate.spawn(_backgroundConnection);
 
     final receiveDone = ReceivePort();
     final writer = await Isolate.spawn(_writeTodoEntryInBackground,
@@ -61,7 +61,7 @@ void main() {
   }, tags: 'background_isolate');
 
   test('errors propagate across isolates', () async {
-    final isolate = await MoorIsolate.spawn(_backgroundConnection);
+    final isolate = await DriftIsolate.spawn(_backgroundConnection);
     final db = TodoDb.connect(await isolate.connect());
 
     await expectLater(
@@ -88,14 +88,14 @@ void main() {
     // The isolate shold eventually exit!
     expect(done.first, completion(anything));
 
-    final moor = await spawned.first as MoorIsolate;
+    final moor = await spawned.first as DriftIsolate;
     await moor.shutdownAll();
   }, tags: 'background_isolate');
 }
 
 void _runTests(
-    FutureOr<MoorIsolate> Function() spawner, bool terminateIsolate) {
-  late MoorIsolate isolate;
+    FutureOr<DriftIsolate> Function() spawner, bool terminateIsolate) {
+  late DriftIsolate isolate;
   late TodoDb database;
 
   setUp(() async {
@@ -261,7 +261,7 @@ void _runTests(
 }
 
 DatabaseConnection _backgroundConnection() {
-  return DatabaseConnection.fromExecutor(VmDatabase.memory());
+  return DatabaseConnection.fromExecutor(NativeDatabase.memory());
 }
 
 Future<void> _writeTodoEntryInBackground(_BackgroundEntryMessage msg) async {
@@ -275,15 +275,15 @@ Future<void> _writeTodoEntryInBackground(_BackgroundEntryMessage msg) async {
 }
 
 class _BackgroundEntryMessage {
-  final MoorIsolate isolate;
+  final DriftIsolate isolate;
   final SendPort sendDone;
 
   _BackgroundEntryMessage(this.isolate, this.sendDone);
 }
 
 void _createBackground(SendPort send) {
-  final moor = MoorIsolate.inCurrent(
-      () => DatabaseConnection.fromExecutor(VmDatabase.memory()),
+  final moor = DriftIsolate.inCurrent(
+      () => DatabaseConnection.fromExecutor(NativeDatabase.memory()),
       killIsolateWhenDone: true);
   send.send(moor);
 }

drift/test/join_test.dart

@@ -1,6 +1,7 @@
+import 'package:drift/drift.dart' hide isNull;
 import 'package:mockito/mockito.dart';
-import 'package:moor/moor.dart' hide isNull;
 import 'package:test/test.dart';
+
 import 'data/tables/todos.dart';
 import 'data/utils/mocks.dart';
 
@@ -376,11 +377,11 @@ void main() {
       () async {
     when(executor.runSelect(any, any)).thenAnswer((_) => Future.error('nah'));
 
-    MoorWrappedException wrappedException;
+    DriftWrappedException wrappedException;
     try {
       await db.select(db.todosTable).join([crossJoin(db.todosTable)]).get();
       fail('expected this to throw');
-    } on MoorWrappedException catch (e) {
+    } on DriftWrappedException catch (e) {
       wrappedException = e;
     }
 

drift/test/schema_test.dart

@@ -1,5 +1,5 @@
+import 'package:drift/drift.dart';
 import 'package:mockito/mockito.dart';
-import 'package:moor/moor.dart';
 import 'package:test/test.dart';
 
 import 'data/tables/todos.dart';

drift/test/select_test.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
+import 'package:drift/drift.dart' hide isNull;
 import 'package:mockito/mockito.dart';
-import 'package:moor/moor.dart' hide isNull;
 import 'package:test/test.dart';
 
 import 'data/tables/todos.dart';

drift/test/serialization_test.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
 import 'package:test/test.dart';
 import 'data/tables/todos.dart';
 

drift/test/streams_test.dart

@@ -1,9 +1,9 @@
 import 'dart:async';
 
+import 'package:drift/drift.dart';
+import 'package:drift/src/runtime/api/runtime_api.dart';
+import 'package:drift/src/runtime/executor/stream_queries.dart';
 import 'package:mockito/mockito.dart';
-import 'package:moor/moor.dart';
-import 'package:moor/src/runtime/api/runtime_api.dart';
-import 'package:moor/src/runtime/executor/stream_queries.dart';
 import 'package:rxdart/rxdart.dart';
 import 'package:test/test.dart';
 

drift/test/tables_test.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
 import 'package:test/test.dart';
 
 import 'data/tables/todos.dart';

drift/test/transactions_test.dart

@@ -1,8 +1,8 @@
+@TestOn('!browser')
 import 'dart:async';
 
+import 'package:drift/drift.dart';
 import 'package:mockito/mockito.dart';
-import 'package:moor/moor.dart';
-@TestOn('!browser')
 import 'package:test/test.dart';
 
 import 'data/tables/todos.dart';

drift/test/types/blob_test.dart

@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
 import 'package:test/test.dart';
 
 void main() {

drift/test/types/datetime_test.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart' as moor;
+import 'package:drift/drift.dart' as moor;
 import 'package:test/test.dart';
 
 const _exampleUnixSqlite = 1550172560;

drift/test/types/enum_index_converter_test.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart';
+import 'package:drift/drift.dart';
 import 'package:test/test.dart';
 
 enum _MyEnum { one, two, three }

drift/test/types/real_type_test.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart' as moor;
+import 'package:drift/drift.dart' as moor;
 import 'package:test/test.dart';
 
 void main() {

drift/test/types/sql_type_test.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart' hide isNull;
+import 'package:drift/drift.dart' hide isNull;
 import 'package:test/test.dart';
 
 void main() {

drift/test/update_test.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
+import 'package:drift/drift.dart';
 import 'package:mockito/mockito.dart';
-import 'package:moor/moor.dart';
 import 'package:test/test.dart';
 
 import 'data/tables/todos.dart';

drift/test/utils/expand_variables_test.dart

@@ -1,4 +1,4 @@
-import 'package:moor/moor.dart' show $expandVar;
+import 'package:drift/drift.dart' show $expandVar;
 import 'package:test/test.dart';
 
 void main() {

drift/test/utils/lazy_database_test.dart

@@ -1,5 +1,5 @@
+import 'package:drift/drift.dart';
 import 'package:mockito/mockito.dart';
-import 'package:moor/moor.dart';
 import 'package:pedantic/pedantic.dart';
 import 'package:test/test.dart';
 

drift/test/utils/single_transformer_test.dart

@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:moor/src/utils/single_transformer.dart';
+import 'package:drift/src/utils/single_transformer.dart';
 import 'package:test/test.dart';
 
 void main() {

drift/test/utils/start_with_value_transformer_test.dart

@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:moor/src/utils/start_with_value_transformer.dart';
+import 'package:drift/src/utils/start_with_value_transformer.dart';
 import 'package:test/test.dart';
 
 void main() {

drift/test/utils/synchronized_test.dart

@@ -1,4 +1,4 @@
-import 'package:moor/src/utils/synchronized.dart';
+import 'package:drift/src/utils/synchronized.dart';
 import 'package:test/test.dart';
 
 void main() {

drift/test/web/binary_string_test.dart

@@ -1,6 +1,6 @@
 import 'dart:typed_data';
 
-import 'package:moor/src/web/binary_string_conversion.dart';
+import 'package:drift/src/web/binary_string_conversion.dart';
 import 'package:test/test.dart';
 
 void main() {

drift/test/web/local_storage_to_indexed_db_test.dart

@@ -1,16 +1,16 @@
 @TestOn('browser')
 import 'dart:convert';
 
-import 'package:moor/moor.dart';
-import 'package:moor/moor_web.dart';
+import 'package:drift/drift.dart';
+import 'package:drift/web.dart';
 import 'package:test/test.dart';
 
 final _allBytes = Uint8List.fromList(List.generate(256, (index) => index));
 
 void main() {
   test('can migrate from local storage to IndexedDb', () async {
-    const local = MoorWebStorage('name');
-    final idb = MoorWebStorage.indexedDb('name');
+    const local = DriftWebStorage('name');
+    final idb = DriftWebStorage.indexedDb('name');
 
     await local.open();
     await local.store(_allBytes);
@@ -26,8 +26,8 @@ void main() {
   test('does not migrate when idb database already exists', () async {
     final otherPayload = Uint8List.fromList(utf8.encode('hello world'));
 
-    const local = MoorWebStorage('name');
-    final idb = MoorWebStorage.indexedDb('name');
+    const local = DriftWebStorage('name');
+    final idb = DriftWebStorage.indexedDb('name');
 
     await idb.open();
     await idb.store(otherPayload);

drift_dev/lib/api/migrations.dart

@@ -1,7 +1,6 @@
+import 'package:drift_dev/src/services/schema/verifier_impl.dart';
 import 'package:meta/meta.dart';
 import 'package:moor/moor.dart';
-
-import 'package:drift_dev/src/services/schema/verifier_impl.dart';
 import 'package:sqlite3/sqlite3.dart';
 
 abstract class SchemaVerifier {

drift_dev/lib/src/analyzer/dart/parser.dart

@@ -3,8 +3,6 @@ import 'package:analyzer/dart/constant/value.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:collection/collection.dart';
-import 'package:meta/meta.dart';
-import 'package:moor/sqlite_keywords.dart';
 import 'package:drift_dev/moor_generator.dart';
 import 'package:drift_dev/src/analyzer/errors.dart';
 import 'package:drift_dev/src/analyzer/runner/steps.dart';
@@ -12,6 +10,8 @@ import 'package:drift_dev/src/model/declarations/declaration.dart';
 import 'package:drift_dev/src/model/used_type_converter.dart';
 import 'package:drift_dev/src/utils/names.dart';
 import 'package:drift_dev/src/utils/type_utils.dart';
+import 'package:meta/meta.dart';
+import 'package:moor/sqlite_keywords.dart';
 import 'package:recase/recase.dart';
 import 'package:source_gen/source_gen.dart';
 

drift_dev/lib/src/analyzer/runner/steps.dart

@@ -1,7 +1,6 @@
 import 'package:analyzer/dart/constant/value.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
-import 'package:moor/moor.dart';
 import 'package:drift_dev/moor_generator.dart';
 import 'package:drift_dev/src/analyzer/dart/parser.dart';
 import 'package:drift_dev/src/analyzer/errors.dart';
@@ -17,6 +16,7 @@ import 'package:drift_dev/src/analyzer/view/view_analyzer.dart';
 import 'package:drift_dev/src/model/sql_query.dart';
 import 'package:drift_dev/src/model/view.dart';
 import 'package:drift_dev/src/utils/entity_reference_sorter.dart';
+import 'package:moor/moor.dart';
 import 'package:source_gen/source_gen.dart';
 
 part 'steps/analyze_dart.dart';

drift_dev/lib/src/analyzer/sql_queries/query_analyzer.dart

@@ -1,5 +1,4 @@
 import 'package:build/build.dart';
-import 'package:meta/meta.dart';
 import 'package:drift_dev/moor_generator.dart';
 import 'package:drift_dev/src/analyzer/errors.dart';
 import 'package:drift_dev/src/analyzer/runner/file_graph.dart';
@@ -9,6 +8,7 @@ import 'package:drift_dev/src/analyzer/sql_queries/query_handler.dart';
 import 'package:drift_dev/src/analyzer/sql_queries/type_mapping.dart';
 import 'package:drift_dev/src/model/sql_query.dart';
 import 'package:drift_dev/src/model/view.dart';
+import 'package:meta/meta.dart';
 import 'package:sqlparser/sqlparser.dart' hide ResultColumn;
 import 'package:sqlparser/utils/find_referenced_tables.dart';
 

drift_dev/lib/src/analyzer/sql_queries/type_mapping.dart

@@ -1,8 +1,8 @@
-import 'package:moor/moor.dart' as m;
 import 'package:drift_dev/moor_generator.dart';
 import 'package:drift_dev/src/model/sql_query.dart';
 import 'package:drift_dev/src/model/view.dart';
 import 'package:drift_dev/src/utils/type_converter_hint.dart';
+import 'package:moor/moor.dart' as m;
 import 'package:sqlparser/sqlparser.dart';
 import 'package:sqlparser/utils/find_referenced_tables.dart' as s;
 

drift_dev/lib/src/backends/build/build_backend.dart

@@ -1,12 +1,13 @@
 import 'dart:convert';
+
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:build/build.dart' hide log;
 import 'package:build/build.dart' as build show log;
-import 'package:logging/logging.dart';
 import 'package:drift_dev/src/analyzer/options.dart';
 import 'package:drift_dev/src/backends/backend.dart';
+import 'package:logging/logging.dart';
 
 class BuildBackend extends Backend {
   final MoorOptions options;

drift_dev/lib/src/backends/common/driver.dart

@@ -7,11 +7,11 @@ import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/overlay_file_system.dart';
 // ignore: implementation_imports
 import 'package:drift/src/utils/synchronized.dart';
-import 'package:logging/logging.dart';
 import 'package:drift_dev/src/analyzer/options.dart';
 import 'package:drift_dev/src/analyzer/runner/file_graph.dart';
 import 'package:drift_dev/src/analyzer/session.dart';
 import 'package:drift_dev/src/utils/options_reader.dart' as options;
+import 'package:logging/logging.dart';
 
 import '../standalone.dart';
 

drift_dev/lib/src/backends/plugin/logger.dart

@@ -1,7 +1,7 @@
 //@dart=2.9
 import 'package:analyzer_plugin/protocol/protocol_generated.dart';
-import 'package:logging/logging.dart';
 import 'package:drift_dev/src/backends/plugin/plugin.dart';
+import 'package:logging/logging.dart';
 
 var _initialized = false;
 

drift_dev/lib/src/cli/cli.dart

@@ -4,9 +4,9 @@ import 'dart:io';
 
 import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:args/command_runner.dart';
-import 'package:logging/logging.dart';
 import 'package:drift_dev/src/backends/common/driver.dart';
 import 'package:drift_dev/src/cli/project.dart';
+import 'package:logging/logging.dart';
 
 import 'commands/analyze.dart';
 import 'commands/identify_databases.dart';

drift_dev/lib/src/model/sql_query.dart

@@ -1,10 +1,10 @@
 import 'package:collection/collection.dart';
-import 'package:moor/moor.dart' show $mrjf, $mrjc, UpdateKind;
 import 'package:drift_dev/src/analyzer/options.dart';
 import 'package:drift_dev/src/analyzer/runner/results.dart';
 import 'package:drift_dev/src/model/base_entity.dart';
 import 'package:drift_dev/src/utils/hash.dart';
 import 'package:drift_dev/src/writer/writer.dart';
+import 'package:moor/moor.dart' show $mrjf, $mrjc, UpdateKind;
 import 'package:recase/recase.dart';
 import 'package:sqlparser/sqlparser.dart';
 

drift_dev/lib/src/model/table.dart

@@ -1,8 +1,8 @@
 import 'package:analyzer/dart/element/element.dart';
-import 'package:moor/moor.dart' show UpdateKind;
 import 'package:drift_dev/src/analyzer/options.dart';
 import 'package:drift_dev/src/model/used_type_converter.dart';
 import 'package:drift_dev/writer.dart';
+import 'package:moor/moor.dart' show UpdateKind;
 import 'package:recase/recase.dart';
 import 'package:sqlparser/sqlparser.dart';
 

drift_dev/lib/src/services/find_stream_update_rules.dart

@@ -1,6 +1,6 @@
 import 'package:collection/collection.dart';
-import 'package:moor/moor.dart';
 import 'package:drift_dev/moor_generator.dart';
+import 'package:moor/moor.dart';
 import 'package:sqlparser/sqlparser.dart';
 
 class FindStreamUpdateRules {

drift_dev/lib/src/services/schema/verifier_impl.dart

@@ -1,8 +1,8 @@
 import 'dart:math';
 
+import 'package:drift_dev/api/migrations.dart';
 import 'package:moor/ffi.dart';
 import 'package:moor/moor.dart';
-import 'package:drift_dev/api/migrations.dart';
 import 'package:sqlite3/sqlite3.dart';
 
 import 'find_differences.dart';

drift_dev/lib/src/writer/database_writer.dart

@@ -1,11 +1,11 @@
 // ignore: implementation_imports
 import 'package:drift/src/runtime/executor/stream_queries.dart';
-import 'package:moor/moor.dart';
 import 'package:drift_dev/moor_generator.dart';
 import 'package:drift_dev/src/services/find_stream_update_rules.dart';
 import 'package:drift_dev/src/utils/string_escaper.dart';
 import 'package:drift_dev/src/utils/type_utils.dart';
 import 'package:drift_dev/writer.dart';
+import 'package:moor/moor.dart';
 import 'package:recase/recase.dart';
 
 import 'tables/view_writer.dart';

drift_dev/lib/src/writer/tables/table_writer.dart

@@ -1,9 +1,9 @@
-import 'package:moor/sqlite_keywords.dart';
 import 'package:drift_dev/moor_generator.dart';
 import 'package:drift_dev/src/model/declarations/declaration.dart';
 import 'package:drift_dev/src/utils/string_escaper.dart';
 import 'package:drift_dev/src/utils/type_utils.dart';
 import 'package:drift_dev/writer.dart';
+import 'package:moor/sqlite_keywords.dart';
 import 'package:sqlparser/sqlparser.dart';
 
 /// Common writer for tables or views.

drift_dev/pubspec.yaml

@@ -25,7 +25,6 @@ dependencies:
   yaml: ^3.1.0
 
   # Moor-specific analysis and apis
-  moor: ^4.4.0
   drift: ^4.6.0
   sqlite3: '>=0.1.6 <2.0.0'
   sqlparser: ^0.17.0
@@ -53,12 +52,10 @@ dev_dependencies:
   json_serializable: ^5.0.0
 
 executables:
-  moor_generator:
+  drift_dev:
 
 dependency_overrides:
   drift:
     path: ../drift
   sqlparser:
     path: ../sqlparser
-  moor:
-    path: ../moor

drift_dev/test/cli/migrate_test.dart

@@ -3,8 +3,8 @@ import 'dart:async';
 import 'dart:io';
 import 'dart:isolate';
 
-import 'package:meta/meta.dart';
 import 'package:drift_dev/src/cli/cli.dart';
+import 'package:meta/meta.dart';
 import 'package:package_config/package_config_types.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/scaffolding.dart';

drift_dev/test/services/find_stream_update_rules_test.dart

@@ -1,8 +1,9 @@
 //@dart=2.9
 @Tags(['analyzer'])
-import 'package:moor/moor.dart';
 import 'package:drift_dev/src/analyzer/runner/results.dart';
 import 'package:drift_dev/src/services/find_stream_update_rules.dart';
+
+import 'package:moor/moor.dart';
 import 'package:test/test.dart';
 
 import '../analyzer/utils.dart';

drift_dev/test/services/schema/verifier_impl_test.dart

@@ -1,6 +1,6 @@
 //@dart=2.9
-import 'package:moor/moor.dart';
 import 'package:drift_dev/api/migrations.dart';
+import 'package:moor/moor.dart';
 import 'package:test/test.dart';
 
 void main() {

drift_dev/test/utils/test_backend.dart

@@ -3,8 +3,8 @@ import 'dart:async';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:build/build.dart';
 import 'package:build_test/build_test.dart';
-import 'package:logging/logging.dart';
 import 'package:drift_dev/src/backends/backend.dart';
+import 'package:logging/logging.dart';
 
 class TestBackend extends Backend {
   final Map<AssetId, String> fakeContent;

moor/pubspec.yaml

@@ -32,6 +32,8 @@ dev_dependencies:
 dependency_overrides:
   drift:
     path: ../drift
+  drift_dev:
+    path: ../drift_dev
   moor_generator:
     path: ../moor_generator
   sqlparser: