diff --git a/.gitignore b/.gitignore
index 3406c8e2..10d6e236 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 # Miscellaneous
-floor/**/*.g.dart
+floor_common/**/*.g.dart
 *.class
 *.log
 *.pyc
diff --git a/floor_common/test/integration/autoincrement/autoinc_test.g.dart b/floor_common/test/integration/autoincrement/autoinc_test.g.dart
deleted file mode 100644
index 875cfb82..00000000
--- a/floor_common/test/integration/autoincrement/autoinc_test.g.dart
+++ /dev/null
@@ -1,151 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'autoinc_test.dart';
-
-// **************************************************************************
-// FloorGenerator
-// **************************************************************************
-
-abstract class $TestDatabaseBuilderContract {
-  /// Adds migrations to the builder.
-  $TestDatabaseBuilderContract addMigrations(List<Migration> migrations);
-
-  /// Adds a database [Callback] to the builder.
-  $TestDatabaseBuilderContract addCallback(Callback callback);
-
-  /// Creates the database and initializes it.
-  Future<TestDatabase> build();
-}
-
-// ignore: avoid_classes_with_only_static_members
-class $FloorTestDatabase {
-  /// Creates a database builder for a persistent database.
-  /// Once a database is built, you should keep a reference to it and re-use it.
-  static $TestDatabaseBuilderContract databaseBuilder(String name) =>
-      _$TestDatabaseBuilder(name);
-
-  /// Creates a database builder for an in memory database.
-  /// Information stored in an in memory database disappears when the process is killed.
-  /// Once a database is built, you should keep a reference to it and re-use it.
-  static $TestDatabaseBuilderContract inMemoryDatabaseBuilder() =>
-      _$TestDatabaseBuilder(null);
-}
-
-class _$TestDatabaseBuilder implements $TestDatabaseBuilderContract {
-  _$TestDatabaseBuilder(this.name);
-
-  final String? name;
-
-  final List<Migration> _migrations = [];
-
-  Callback? _callback;
-
-  @override
-  $TestDatabaseBuilderContract addMigrations(List<Migration> migrations) {
-    _migrations.addAll(migrations);
-    return this;
-  }
-
-  @override
-  $TestDatabaseBuilderContract addCallback(Callback callback) {
-    _callback = callback;
-    return this;
-  }
-
-  @override
-  Future<TestDatabase> build() async {
-    final path = name != null
-        ? await sqfliteDatabaseFactory.getDatabasePath(name!)
-        : ':memory:';
-    final database = _$TestDatabase();
-    database.database = await database.open(
-      path,
-      _migrations,
-      _callback,
-    );
-    return database;
-  }
-}
-
-class _$TestDatabase extends TestDatabase {
-  _$TestDatabase([StreamController<String>? listener]) {
-    changeListener = listener ?? StreamController<String>.broadcast();
-  }
-
-  AIDao? _aiDaoInstance;
-
-  Future<sqflite.Database> open(
-    String path,
-    List<Migration> migrations, [
-    Callback? callback,
-  ]) async {
-    final databaseOptions = sqflite.OpenDatabaseOptions(
-      version: 1,
-      onConfigure: (database) async {
-        await database.execute('PRAGMA foreign_keys = ON');
-        await callback?.onConfigure?.call(database);
-      },
-      onOpen: (database) async {
-        await callback?.onOpen?.call(database);
-      },
-      onUpgrade: (database, startVersion, endVersion) async {
-        await MigrationAdapter.runMigrations(
-            database, startVersion, endVersion, migrations);
-
-        await callback?.onUpgrade?.call(database, startVersion, endVersion);
-      },
-      onCreate: (database, version) async {
-        await database.execute(
-            'CREATE TABLE IF NOT EXISTS `AutoIncEntity` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `decimal` REAL NOT NULL)');
-
-        await callback?.onCreate?.call(database, version);
-      },
-    );
-    return sqfliteDatabaseFactory.openDatabase(path, options: databaseOptions);
-  }
-
-  @override
-  AIDao get aiDao {
-    return _aiDaoInstance ??= _$AIDao(database, changeListener);
-  }
-}
-
-class _$AIDao extends AIDao {
-  _$AIDao(
-    this.database,
-    this.changeListener,
-  )   : _queryAdapter = QueryAdapter(database),
-        _autoIncEntityInsertionAdapter = InsertionAdapter(
-            database,
-            'AutoIncEntity',
-            (AutoIncEntity item) =>
-                <String, Object?>{'id': item.id, 'decimal': item.decimal});
-
-  final sqflite.DatabaseExecutor database;
-
-  final StreamController<String> changeListener;
-
-  final QueryAdapter _queryAdapter;
-
-  final InsertionAdapter<AutoIncEntity> _autoIncEntityInsertionAdapter;
-
-  @override
-  Future<AutoIncEntity?> findWithId(int val) async {
-    return _queryAdapter.query('SELECT * FROM AutoIncEntity where id = ?1',
-        mapper: (Map<String, Object?> row) =>
-            AutoIncEntity(row['decimal'] as double, id: row['id'] as int?),
-        arguments: [val]);
-  }
-
-  @override
-  Future<List<AutoIncEntity>> findAll() async {
-    return _queryAdapter.queryList('SELECT * FROM AutoIncEntity',
-        mapper: (Map<String, Object?> row) =>
-            AutoIncEntity(row['decimal'] as double, id: row['id'] as int?));
-  }
-
-  @override
-  Future<void> insertAIEntity(AutoIncEntity e) async {
-    await _autoIncEntityInsertionAdapter.insert(e, OnConflictStrategy.abort);
-  }
-}
diff --git a/floor_common/test/integration/blob/blob_test.g.dart b/floor_common/test/integration/blob/blob_test.g.dart
deleted file mode 100644
index 54932cb0..00000000
--- a/floor_common/test/integration/blob/blob_test.g.dart
+++ /dev/null
@@ -1,147 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'blob_test.dart';
-
-// **************************************************************************
-// FloorGenerator
-// **************************************************************************
-
-abstract class $TestDatabaseBuilderContract {
-  /// Adds migrations to the builder.
-  $TestDatabaseBuilderContract addMigrations(List<Migration> migrations);
-
-  /// Adds a database [Callback] to the builder.
-  $TestDatabaseBuilderContract addCallback(Callback callback);
-
-  /// Creates the database and initializes it.
-  Future<TestDatabase> build();
-}
-
-// ignore: avoid_classes_with_only_static_members
-class $FloorTestDatabase {
-  /// Creates a database builder for a persistent database.
-  /// Once a database is built, you should keep a reference to it and re-use it.
-  static $TestDatabaseBuilderContract databaseBuilder(String name) =>
-      _$TestDatabaseBuilder(name);
-
-  /// Creates a database builder for an in memory database.
-  /// Information stored in an in memory database disappears when the process is killed.
-  /// Once a database is built, you should keep a reference to it and re-use it.
-  static $TestDatabaseBuilderContract inMemoryDatabaseBuilder() =>
-      _$TestDatabaseBuilder(null);
-}
-
-class _$TestDatabaseBuilder implements $TestDatabaseBuilderContract {
-  _$TestDatabaseBuilder(this.name);
-
-  final String? name;
-
-  final List<Migration> _migrations = [];
-
-  Callback? _callback;
-
-  @override
-  $TestDatabaseBuilderContract addMigrations(List<Migration> migrations) {
-    _migrations.addAll(migrations);
-    return this;
-  }
-
-  @override
-  $TestDatabaseBuilderContract addCallback(Callback callback) {
-    _callback = callback;
-    return this;
-  }
-
-  @override
-  Future<TestDatabase> build() async {
-    final path = name != null
-        ? await sqfliteDatabaseFactory.getDatabasePath(name!)
-        : ':memory:';
-    final database = _$TestDatabase();
-    database.database = await database.open(
-      path,
-      _migrations,
-      _callback,
-    );
-    return database;
-  }
-}
-
-class _$TestDatabase extends TestDatabase {
-  _$TestDatabase([StreamController<String>? listener]) {
-    changeListener = listener ?? StreamController<String>.broadcast();
-  }
-
-  PersonDao? _personDaoInstance;
-
-  Future<sqflite.Database> open(
-    String path,
-    List<Migration> migrations, [
-    Callback? callback,
-  ]) async {
-    final databaseOptions = sqflite.OpenDatabaseOptions(
-      version: 1,
-      onConfigure: (database) async {
-        await database.execute('PRAGMA foreign_keys = ON');
-        await callback?.onConfigure?.call(database);
-      },
-      onOpen: (database) async {
-        await callback?.onOpen?.call(database);
-      },
-      onUpgrade: (database, startVersion, endVersion) async {
-        await MigrationAdapter.runMigrations(
-            database, startVersion, endVersion, migrations);
-
-        await callback?.onUpgrade?.call(database, startVersion, endVersion);
-      },
-      onCreate: (database, version) async {
-        await database.execute(
-            'CREATE TABLE IF NOT EXISTS `Person` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `picture` BLOB NOT NULL, PRIMARY KEY (`id`))');
-
-        await callback?.onCreate?.call(database, version);
-      },
-    );
-    return sqfliteDatabaseFactory.openDatabase(path, options: databaseOptions);
-  }
-
-  @override
-  PersonDao get personDao {
-    return _personDaoInstance ??= _$PersonDao(database, changeListener);
-  }
-}
-
-class _$PersonDao extends PersonDao {
-  _$PersonDao(
-    this.database,
-    this.changeListener,
-  )   : _queryAdapter = QueryAdapter(database),
-        _personInsertionAdapter = InsertionAdapter(
-            database,
-            'Person',
-            (Person item) => <String, Object?>{
-                  'id': item.id,
-                  'name': item.name,
-                  'picture': item.picture
-                });
-
-  final sqflite.DatabaseExecutor database;
-
-  final StreamController<String> changeListener;
-
-  final QueryAdapter _queryAdapter;
-
-  final InsertionAdapter<Person> _personInsertionAdapter;
-
-  @override
-  Future<Person?> findPersonByPicture(Uint8List picture) async {
-    return _queryAdapter.query('SELECT * FROM Person WHERE picture = ?1',
-        mapper: (Map<String, Object?> row) => Person(row['id'] as int,
-            row['name'] as String, row['picture'] as Uint8List),
-        arguments: [picture]);
-  }
-
-  @override
-  Future<void> insertPerson(Person person) async {
-    await _personInsertionAdapter.insert(person, OnConflictStrategy.abort);
-  }
-}
diff --git a/floor_common/test/integration/boolean_conversions/bool_test.g.dart b/floor_common/test/integration/boolean_conversions/bool_test.g.dart
deleted file mode 100644
index d517c02f..00000000
--- a/floor_common/test/integration/boolean_conversions/bool_test.g.dart
+++ /dev/null
@@ -1,175 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'bool_test.dart';
-
-// **************************************************************************
-// FloorGenerator
-// **************************************************************************
-
-abstract class $TestDatabaseBuilderContract {
-  /// Adds migrations to the builder.
-  $TestDatabaseBuilderContract addMigrations(List<Migration> migrations);
-
-  /// Adds a database [Callback] to the builder.
-  $TestDatabaseBuilderContract addCallback(Callback callback);
-
-  /// Creates the database and initializes it.
-  Future<TestDatabase> build();
-}
-
-// ignore: avoid_classes_with_only_static_members
-class $FloorTestDatabase {
-  /// Creates a database builder for a persistent database.
-  /// Once a database is built, you should keep a reference to it and re-use it.
-  static $TestDatabaseBuilderContract databaseBuilder(String name) =>
-      _$TestDatabaseBuilder(name);
-
-  /// Creates a database builder for an in memory database.
-  /// Information stored in an in memory database disappears when the process is killed.
-  /// Once a database is built, you should keep a reference to it and re-use it.
-  static $TestDatabaseBuilderContract inMemoryDatabaseBuilder() =>
-      _$TestDatabaseBuilder(null);
-}
-
-class _$TestDatabaseBuilder implements $TestDatabaseBuilderContract {
-  _$TestDatabaseBuilder(this.name);
-
-  final String? name;
-
-  final List<Migration> _migrations = [];
-
-  Callback? _callback;
-
-  @override
-  $TestDatabaseBuilderContract addMigrations(List<Migration> migrations) {
-    _migrations.addAll(migrations);
-    return this;
-  }
-
-  @override
-  $TestDatabaseBuilderContract addCallback(Callback callback) {
-    _callback = callback;
-    return this;
-  }
-
-  @override
-  Future<TestDatabase> build() async {
-    final path = name != null
-        ? await sqfliteDatabaseFactory.getDatabasePath(name!)
-        : ':memory:';
-    final database = _$TestDatabase();
-    database.database = await database.open(
-      path,
-      _migrations,
-      _callback,
-    );
-    return database;
-  }
-}
-
-class _$TestDatabase extends TestDatabase {
-  _$TestDatabase([StreamController<String>? listener]) {
-    changeListener = listener ?? StreamController<String>.broadcast();
-  }
-
-  BoolDao? _boolDaoInstance;
-
-  Future<sqflite.Database> open(
-    String path,
-    List<Migration> migrations, [
-    Callback? callback,
-  ]) async {
-    final databaseOptions = sqflite.OpenDatabaseOptions(
-      version: 1,
-      onConfigure: (database) async {
-        await database.execute('PRAGMA foreign_keys = ON');
-        await callback?.onConfigure?.call(database);
-      },
-      onOpen: (database) async {
-        await callback?.onOpen?.call(database);
-      },
-      onUpgrade: (database, startVersion, endVersion) async {
-        await MigrationAdapter.runMigrations(
-            database, startVersion, endVersion, migrations);
-
-        await callback?.onUpgrade?.call(database, startVersion, endVersion);
-      },
-      onCreate: (database, version) async {
-        await database.execute(
-            'CREATE TABLE IF NOT EXISTS `BooleanClass` (`id` INTEGER, `nullable` INTEGER, `nonNullable` INTEGER NOT NULL, PRIMARY KEY (`id`))');
-
-        await callback?.onCreate?.call(database, version);
-      },
-    );
-    return sqfliteDatabaseFactory.openDatabase(path, options: databaseOptions);
-  }
-
-  @override
-  BoolDao get boolDao {
-    return _boolDaoInstance ??= _$BoolDao(database, changeListener);
-  }
-}
-
-class _$BoolDao extends BoolDao {
-  _$BoolDao(
-    this.database,
-    this.changeListener,
-  )   : _queryAdapter = QueryAdapter(database),
-        _booleanClassInsertionAdapter = InsertionAdapter(
-            database,
-            'BooleanClass',
-            (BooleanClass item) => <String, Object?>{
-                  'id': item.id == null ? null : (item.id! ? 1 : 0),
-                  'nullable':
-                      item.nullable == null ? null : (item.nullable! ? 1 : 0),
-                  'nonNullable': item.nonNullable ? 1 : 0
-                });
-
-  final sqflite.DatabaseExecutor database;
-
-  final StreamController<String> changeListener;
-
-  final QueryAdapter _queryAdapter;
-
-  final InsertionAdapter<BooleanClass> _booleanClassInsertionAdapter;
-
-  @override
-  Future<BooleanClass?> findWithNonNullable(bool val) async {
-    return _queryAdapter.query(
-        'SELECT * FROM BooleanClass where nonNullable = ?1',
-        mapper: (Map<String, Object?> row) => BooleanClass(
-            row['id'] == null ? null : (row['id'] as int) != 0,
-            nullable:
-                row['nullable'] == null ? null : (row['nullable'] as int) != 0,
-            nonNullable: (row['nonNullable'] as int) != 0),
-        arguments: [val ? 1 : 0]);
-  }
-
-  @override
-  Future<BooleanClass?> findWithNullable(bool val) async {
-    return _queryAdapter.query('SELECT * FROM BooleanClass where nullable = ?1',
-        mapper: (Map<String, Object?> row) => BooleanClass(
-            row['id'] == null ? null : (row['id'] as int) != 0,
-            nullable:
-                row['nullable'] == null ? null : (row['nullable'] as int) != 0,
-            nonNullable: (row['nonNullable'] as int) != 0),
-        arguments: [val ? 1 : 0]);
-  }
-
-  @override
-  Future<BooleanClass?> findWithNullableBeingNull() async {
-    return _queryAdapter.query(
-        'SELECT * FROM BooleanClass where nullable IS NULL',
-        mapper: (Map<String, Object?> row) => BooleanClass(
-            row['id'] == null ? null : (row['id'] as int) != 0,
-            nullable:
-                row['nullable'] == null ? null : (row['nullable'] as int) != 0,
-            nonNullable: (row['nonNullable'] as int) != 0));
-  }
-
-  @override
-  Future<void> insertBoolC(BooleanClass person) async {
-    await _booleanClassInsertionAdapter.insert(
-        person, OnConflictStrategy.abort);
-  }
-}
diff --git a/floor_common/test/integration/database.g.dart b/floor_common/test/integration/database.g.dart
deleted file mode 100644
index 35f5f67f..00000000
--- a/floor_common/test/integration/database.g.dart
+++ /dev/null
@@ -1,447 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'database.dart';
-
-// **************************************************************************
-// FloorGenerator
-// **************************************************************************
-
-abstract class $TestDatabaseBuilderContract {
-  /// Adds migrations to the builder.
-  $TestDatabaseBuilderContract addMigrations(List<Migration> migrations);
-
-  /// Adds a database [Callback] to the builder.
-  $TestDatabaseBuilderContract addCallback(Callback callback);
-
-  /// Creates the database and initializes it.
-  Future<TestDatabase> build();
-}
-
-// ignore: avoid_classes_with_only_static_members
-class $FloorTestDatabase {
-  /// Creates a database builder for a persistent database.
-  /// Once a database is built, you should keep a reference to it and re-use it.
-  static $TestDatabaseBuilderContract databaseBuilder(String name) =>
-      _$TestDatabaseBuilder(name);
-
-  /// Creates a database builder for an in memory database.
-  /// Information stored in an in memory database disappears when the process is killed.
-  /// Once a database is built, you should keep a reference to it and re-use it.
-  static $TestDatabaseBuilderContract inMemoryDatabaseBuilder() =>
-      _$TestDatabaseBuilder(null);
-}
-
-class _$TestDatabaseBuilder implements $TestDatabaseBuilderContract {
-  _$TestDatabaseBuilder(this.name);
-
-  final String? name;
-
-  final List<Migration> _migrations = [];
-
-  Callback? _callback;
-
-  @override
-  $TestDatabaseBuilderContract addMigrations(List<Migration> migrations) {
-    _migrations.addAll(migrations);
-    return this;
-  }
-
-  @override
-  $TestDatabaseBuilderContract addCallback(Callback callback) {
-    _callback = callback;
-    return this;
-  }
-
-  @override
-  Future<TestDatabase> build() async {
-    final path = name != null
-        ? await sqfliteDatabaseFactory.getDatabasePath(name!)
-        : ':memory:';
-    final database = _$TestDatabase();
-    database.database = await database.open(
-      path,
-      _migrations,
-      _callback,
-    );
-    return database;
-  }
-}
-
-class _$TestDatabase extends TestDatabase {
-  _$TestDatabase([StreamController<String>? listener]) {
-    changeListener = listener ?? StreamController<String>.broadcast();
-  }
-
-  PersonDao? _personDaoInstance;
-
-  DogDao? _dogDaoInstance;
-
-  Future<sqflite.Database> open(
-    String path,
-    List<Migration> migrations, [
-    Callback? callback,
-  ]) async {
-    final databaseOptions = sqflite.OpenDatabaseOptions(
-      version: 2,
-      onConfigure: (database) async {
-        await database.execute('PRAGMA foreign_keys = ON');
-        await callback?.onConfigure?.call(database);
-      },
-      onOpen: (database) async {
-        await callback?.onOpen?.call(database);
-      },
-      onUpgrade: (database, startVersion, endVersion) async {
-        await MigrationAdapter.runMigrations(
-            database, startVersion, endVersion, migrations);
-
-        await callback?.onUpgrade?.call(database, startVersion, endVersion);
-      },
-      onCreate: (database, version) async {
-        await database.execute(
-            'CREATE TABLE IF NOT EXISTS `person` (`id` INTEGER, `custom_name` TEXT NOT NULL, PRIMARY KEY (`id`))');
-        await database.execute(
-            'CREATE TABLE IF NOT EXISTS `dog` (`id` INTEGER, `name` TEXT NOT NULL, `nick_name` TEXT NOT NULL, `owner_id` INTEGER NOT NULL, FOREIGN KEY (`owner_id`) REFERENCES `person` (`id`) ON UPDATE NO ACTION ON DELETE CASCADE, PRIMARY KEY (`id`))');
-        await database.execute(
-            'CREATE INDEX `index_person_custom_name` ON `person` (`custom_name`)');
-
-        await callback?.onCreate?.call(database, version);
-      },
-    );
-    return sqfliteDatabaseFactory.openDatabase(path, options: databaseOptions);
-  }
-
-  @override
-  PersonDao get personDao {
-    return _personDaoInstance ??= _$PersonDao(database, changeListener);
-  }
-
-  @override
-  DogDao get dogDao {
-    return _dogDaoInstance ??= _$DogDao(database, changeListener);
-  }
-}
-
-class _$PersonDao extends PersonDao {
-  _$PersonDao(
-    this.database,
-    this.changeListener,
-  )   : _queryAdapter = QueryAdapter(database, changeListener),
-        _personInsertionAdapter = InsertionAdapter(
-            database,
-            'person',
-            (Person item) =>
-                <String, Object?>{'id': item.id, 'custom_name': item.name},
-            changeListener),
-        _personUpdateAdapter = UpdateAdapter(
-            database,
-            'person',
-            ['id'],
-            (Person item) =>
-                <String, Object?>{'id': item.id, 'custom_name': item.name},
-            changeListener),
-        _personDeletionAdapter = DeletionAdapter(
-            database,
-            'person',
-            ['id'],
-            (Person item) =>
-                <String, Object?>{'id': item.id, 'custom_name': item.name},
-            changeListener);
-
-  final sqflite.DatabaseExecutor database;
-
-  final StreamController<String> changeListener;
-
-  final QueryAdapter _queryAdapter;
-
-  final InsertionAdapter<Person> _personInsertionAdapter;
-
-  final UpdateAdapter<Person> _personUpdateAdapter;
-
-  final DeletionAdapter<Person> _personDeletionAdapter;
-
-  @override
-  Future<List<Person>> findAllPersons() async {
-    return _queryAdapter.queryList('SELECT * FROM person',
-        mapper: (Map<String, Object?> row) =>
-            Person(row['id'] as int?, row['custom_name'] as String));
-  }
-
-  @override
-  Stream<List<Person>> findAllPersonsAsStream() {
-    return _queryAdapter.queryListStream('SELECT * FROM person',
-        mapper: (Map<String, Object?> row) =>
-            Person(row['id'] as int?, row['custom_name'] as String),
-        queryableName: 'person',
-        isView: false);
-  }
-
-  @override
-  Future<Person?> findPersonById(int id) async {
-    return _queryAdapter.query('SELECT * FROM person WHERE id = ?1',
-        mapper: (Map<String, Object?> row) =>
-            Person(row['id'] as int?, row['custom_name'] as String),
-        arguments: [id]);
-  }
-
-  @override
-  Stream<Person?> findPersonByIdAsStream(int id) {
-    return _queryAdapter.queryStream('SELECT * FROM person WHERE id = ?1',
-        mapper: (Map<String, Object?> row) =>
-            Person(row['id'] as int?, row['custom_name'] as String),
-        arguments: [id],
-        queryableName: 'person',
-        isView: false);
-  }
-
-  @override
-  Stream<int?> uniqueRecordsCountAsStream() {
-    return _queryAdapter.queryStream('SELECT DISTINCT COUNT(id) FROM person',
-        mapper: (Map<String, Object?> row) => row.values.first as int,
-        queryableName: 'person',
-        isView: false);
-  }
-
-  @override
-  Future<Person?> findPersonByIdAndName(
-    int id,
-    String name,
-  ) async {
-    return _queryAdapter.query(
-        'SELECT * FROM person WHERE id = ?1 AND custom_name = ?2',
-        mapper: (Map<String, Object?> row) =>
-            Person(row['id'] as int?, row['custom_name'] as String),
-        arguments: [id, name]);
-  }
-
-  @override
-  Future<List<Person>> findPersonsWithIds(List<int> ids) async {
-    const offset = 1;
-    final _sqliteVariablesForIds =
-        Iterable<String>.generate(ids.length, (i) => '?${i + offset}')
-            .join(',');
-    return _queryAdapter.queryList(
-        'SELECT * FROM person WHERE id IN (' + _sqliteVariablesForIds + ')',
-        mapper: (Map<String, Object?> row) =>
-            Person(row['id'] as int?, row['custom_name'] as String),
-        arguments: [...ids]);
-  }
-
-  @override
-  Future<List<Person>> findPersonsWithNames(List<String> names) async {
-    const offset = 1;
-    final _sqliteVariablesForNames =
-        Iterable<String>.generate(names.length, (i) => '?${i + offset}')
-            .join(',');
-    return _queryAdapter.queryList(
-        'SELECT * FROM person WHERE custom_name IN (' +
-            _sqliteVariablesForNames +
-            ')',
-        mapper: (Map<String, Object?> row) =>
-            Person(row['id'] as int?, row['custom_name'] as String),
-        arguments: [...names]);
-  }
-
-  @override
-  Future<List<Person>> findPersonsWithNamesComplex(
-    int reference,
-    List<String> names,
-    List<String> moreNames,
-  ) async {
-    int offset = 2;
-    final _sqliteVariablesForNames =
-        Iterable<String>.generate(names.length, (i) => '?${i + offset}')
-            .join(',');
-    offset += names.length;
-    final _sqliteVariablesForMoreNames =
-        Iterable<String>.generate(moreNames.length, (i) => '?${i + offset}')
-            .join(',');
-    return _queryAdapter.queryList(
-        'SELECT * FROM person WHERE custom_name IN (' +
-            _sqliteVariablesForNames +
-            ') AND id>=?1 OR custom_name IN (' +
-            _sqliteVariablesForMoreNames +
-            ') AND id<=?1',
-        mapper: (Map<String, Object?> row) =>
-            Person(row['id'] as int?, row['custom_name'] as String),
-        arguments: [reference, ...names, ...moreNames]);
-  }
-
-  @override
-  Future<List<Person>> findPersonsWithNamesLike(String name) async {
-    return _queryAdapter.queryList(
-        'SELECT * FROM person WHERE custom_name LIKE ?1',
-        mapper: (Map<String, Object?> row) =>
-            Person(row['id'] as int?, row['custom_name'] as String),
-        arguments: [name]);
-  }
-
-  @override
-  Future<List<Person>> findPersonsWithEmptyName() async {
-    return _queryAdapter.queryList(
-        'SELECT * FROM person WHERE custom_name == \'\'',
-        mapper: (Map<String, Object?> row) =>
-            Person(row['id'] as int?, row['custom_name'] as String));
-  }
-
-  @override
-  Future<void> deleteAllPersons() async {
-    await _queryAdapter.queryNoReturn('DELETE FROM person');
-  }
-
-  @override
-  Stream<List<Dog>> findAllDogsOfPersonAsStream(int id) {
-    return _queryAdapter.queryListStream(
-        'SELECT * FROM dog WHERE owner_id = ?1',
-        mapper: (Map<String, Object?> row) => Dog(
-            row['id'] as int?,
-            row['name'] as String,
-            row['nick_name'] as String,
-            row['owner_id'] as int),
-        arguments: [id],
-        queryableName: 'dog',
-        isView: false);
-  }
-
-  @override
-  Future<void> insertPerson(Person person) async {
-    await _personInsertionAdapter.insert(person, OnConflictStrategy.replace);
-  }
-
-  @override
-  Future<void> insertPersons(List<Person> persons) async {
-    await _personInsertionAdapter.insertList(persons, OnConflictStrategy.abort);
-  }
-
-  @override
-  Future<int> insertPersonWithReturn(Person person) {
-    return _personInsertionAdapter.insertAndReturnId(
-        person, OnConflictStrategy.abort);
-  }
-
-  @override
-  Future<List<int>> insertPersonsWithReturn(List<Person> persons) {
-    return _personInsertionAdapter.insertListAndReturnIds(
-        persons, OnConflictStrategy.abort);
-  }
-
-  @override
-  Future<void> updatePerson(Person person) async {
-    await _personUpdateAdapter.update(person, OnConflictStrategy.abort);
-  }
-
-  @override
-  Future<void> updatePersons(List<Person> persons) async {
-    await _personUpdateAdapter.updateList(persons, OnConflictStrategy.abort);
-  }
-
-  @override
-  Future<int> updatePersonWithReturn(Person person) {
-    return _personUpdateAdapter.updateAndReturnChangedRows(
-        person, OnConflictStrategy.abort);
-  }
-
-  @override
-  Future<int> updatePersonsWithReturn(List<Person> persons) {
-    return _personUpdateAdapter.updateListAndReturnChangedRows(
-        persons, OnConflictStrategy.abort);
-  }
-
-  @override
-  Future<void> deletePerson(Person person) async {
-    await _personDeletionAdapter.delete(person);
-  }
-
-  @override
-  Future<void> deletePersons(List<Person> person) async {
-    await _personDeletionAdapter.deleteList(person);
-  }
-
-  @override
-  Future<int> deletePersonWithReturn(Person person) {
-    return _personDeletionAdapter.deleteAndReturnChangedRows(person);
-  }
-
-  @override
-  Future<int> deletePersonsWithReturn(List<Person> persons) {
-    return _personDeletionAdapter.deleteListAndReturnChangedRows(persons);
-  }
-
-  @override
-  Future<void> replacePersons(List<Person> persons) async {
-    if (database is sqflite.Transaction) {
-      await super.replacePersons(persons);
-    } else {
-      await (database as sqflite.Database)
-          .transaction<void>((transaction) async {
-        final transactionDatabase = _$TestDatabase(changeListener)
-          ..database = transaction;
-        await transactionDatabase.personDao.replacePersons(persons);
-      });
-    }
-  }
-
-  @override
-  Future<List<Person>> replacePersonsAndReturn(List<Person> persons) async {
-    if (database is sqflite.Transaction) {
-      return super.replacePersonsAndReturn(persons);
-    } else {
-      return (database as sqflite.Database)
-          .transaction<List<Person>>((transaction) async {
-        final transactionDatabase = _$TestDatabase(changeListener)
-          ..database = transaction;
-        return transactionDatabase.personDao.replacePersonsAndReturn(persons);
-      });
-    }
-  }
-}
-
-class _$DogDao extends DogDao {
-  _$DogDao(
-    this.database,
-    this.changeListener,
-  )   : _queryAdapter = QueryAdapter(database),
-        _dogInsertionAdapter = InsertionAdapter(
-            database,
-            'dog',
-            (Dog item) => <String, Object?>{
-                  'id': item.id,
-                  'name': item.name,
-                  'nick_name': item.nickName,
-                  'owner_id': item.ownerId
-                },
-            changeListener);
-
-  final sqflite.DatabaseExecutor database;
-
-  final StreamController<String> changeListener;
-
-  final QueryAdapter _queryAdapter;
-
-  final InsertionAdapter<Dog> _dogInsertionAdapter;
-
-  @override
-  Future<Dog?> findDogForPersonId(int id) async {
-    return _queryAdapter.query('SELECT * FROM dog WHERE owner_id = ?1',
-        mapper: (Map<String, Object?> row) => Dog(
-            row['id'] as int?,
-            row['name'] as String,
-            row['nick_name'] as String,
-            row['owner_id'] as int),
-        arguments: [id]);
-  }
-
-  @override
-  Future<List<Dog>> findAllDogs() async {
-    return _queryAdapter.queryList('SELECT * FROM dog',
-        mapper: (Map<String, Object?> row) => Dog(
-            row['id'] as int?,
-            row['name'] as String,
-            row['nick_name'] as String,
-            row['owner_id'] as int));
-  }
-
-  @override
-  Future<void> insertDog(Dog dog) async {
-    await _dogInsertionAdapter.insert(dog, OnConflictStrategy.abort);
-  }
-}
diff --git a/floor_common/test/integration/fts/mail_database.g.dart b/floor_common/test/integration/fts/mail_database.g.dart
deleted file mode 100644
index bc803044..00000000
--- a/floor_common/test/integration/fts/mail_database.g.dart
+++ /dev/null
@@ -1,212 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'mail_database.dart';
-
-// **************************************************************************
-// FloorGenerator
-// **************************************************************************
-
-abstract class $MailDatabaseBuilderContract {
-  /// Adds migrations to the builder.
-  $MailDatabaseBuilderContract addMigrations(List<Migration> migrations);
-
-  /// Adds a database [Callback] to the builder.
-  $MailDatabaseBuilderContract addCallback(Callback callback);
-
-  /// Creates the database and initializes it.
-  Future<MailDatabase> build();
-}
-
-// ignore: avoid_classes_with_only_static_members
-class $FloorMailDatabase {
-  /// Creates a database builder for a persistent database.
-  /// Once a database is built, you should keep a reference to it and re-use it.
-  static $MailDatabaseBuilderContract databaseBuilder(String name) =>
-      _$MailDatabaseBuilder(name);
-
-  /// Creates a database builder for an in memory database.
-  /// Information stored in an in memory database disappears when the process is killed.
-  /// Once a database is built, you should keep a reference to it and re-use it.
-  static $MailDatabaseBuilderContract inMemoryDatabaseBuilder() =>
-      _$MailDatabaseBuilder(null);
-}
-
-class _$MailDatabaseBuilder implements $MailDatabaseBuilderContract {
-  _$MailDatabaseBuilder(this.name);
-
-  final String? name;
-
-  final List<Migration> _migrations = [];
-
-  Callback? _callback;
-
-  @override
-  $MailDatabaseBuilderContract addMigrations(List<Migration> migrations) {
-    _migrations.addAll(migrations);
-    return this;
-  }
-
-  @override
-  $MailDatabaseBuilderContract addCallback(Callback callback) {
-    _callback = callback;
-    return this;
-  }
-
-  @override
-  Future<MailDatabase> build() async {
-    final path = name != null
-        ? await sqfliteDatabaseFactory.getDatabasePath(name!)
-        : ':memory:';
-    final database = _$MailDatabase();
-    database.database = await database.open(
-      path,
-      _migrations,
-      _callback,
-    );
-    return database;
-  }
-}
-
-class _$MailDatabase extends MailDatabase {
-  _$MailDatabase([StreamController<String>? listener]) {
-    changeListener = listener ?? StreamController<String>.broadcast();
-  }
-
-  MailDao? _mailDaoInstance;
-
-  Future<sqflite.Database> open(
-    String path,
-    List<Migration> migrations, [
-    Callback? callback,
-  ]) async {
-    final databaseOptions = sqflite.OpenDatabaseOptions(
-      version: 1,
-      onConfigure: (database) async {
-        await database.execute('PRAGMA foreign_keys = ON');
-        await callback?.onConfigure?.call(database);
-      },
-      onOpen: (database) async {
-        await callback?.onOpen?.call(database);
-      },
-      onUpgrade: (database, startVersion, endVersion) async {
-        await MigrationAdapter.runMigrations(
-            database, startVersion, endVersion, migrations);
-
-        await callback?.onUpgrade?.call(database, startVersion, endVersion);
-      },
-      onCreate: (database, version) async {
-        await database.execute(
-            'CREATE VIRTUAL TABLE IF NOT EXISTS `mail` USING fts4(`rowid` INTEGER NOT NULL, `text` TEXT NOT NULL, PRIMARY KEY (`rowid`), tokenize=unicode61 )');
-
-        await callback?.onCreate?.call(database, version);
-      },
-    );
-    return sqfliteDatabaseFactory.openDatabase(path, options: databaseOptions);
-  }
-
-  @override
-  MailDao get mailDao {
-    return _mailDaoInstance ??= _$MailDao(database, changeListener);
-  }
-}
-
-class _$MailDao extends MailDao {
-  _$MailDao(
-    this.database,
-    this.changeListener,
-  )   : _queryAdapter = QueryAdapter(database, changeListener),
-        _mailInsertionAdapter = InsertionAdapter(
-            database,
-            'mail',
-            (Mail item) =>
-                <String, Object?>{'rowid': item.id, 'text': item.text},
-            changeListener),
-        _mailUpdateAdapter = UpdateAdapter(
-            database,
-            'mail',
-            ['rowid'],
-            (Mail item) =>
-                <String, Object?>{'rowid': item.id, 'text': item.text},
-            changeListener),
-        _mailDeletionAdapter = DeletionAdapter(
-            database,
-            'mail',
-            ['rowid'],
-            (Mail item) =>
-                <String, Object?>{'rowid': item.id, 'text': item.text},
-            changeListener);
-
-  final sqflite.DatabaseExecutor database;
-
-  final StreamController<String> changeListener;
-
-  final QueryAdapter _queryAdapter;
-
-  final InsertionAdapter<Mail> _mailInsertionAdapter;
-
-  final UpdateAdapter<Mail> _mailUpdateAdapter;
-
-  final DeletionAdapter<Mail> _mailDeletionAdapter;
-
-  @override
-  Future<Mail?> findMailById(int id) async {
-    return _queryAdapter.query('SELECT * FROM mail WHERE rowid = ?1',
-        mapper: (Map<String, Object?> row) =>
-            Mail(row['rowid'] as int, row['text'] as String),
-        arguments: [id]);
-  }
-
-  @override
-  Future<List<Mail>> findMailByKey(String key) async {
-    return _queryAdapter.queryList('SELECT * FROM mail WHERE text match ?1',
-        mapper: (Map<String, Object?> row) =>
-            Mail(row['rowid'] as int, row['text'] as String),
-        arguments: [key]);
-  }
-
-  @override
-  Future<List<Mail>> findAllMails() async {
-    return _queryAdapter.queryList('SELECT * FROM mail',
-        mapper: (Map<String, Object?> row) =>
-            Mail(row['rowid'] as int, row['text'] as String));
-  }
-
-  @override
-  Stream<List<Mail>> findAllMailsAsStream() {
-    return _queryAdapter.queryListStream('SELECT * FROM mail',
-        mapper: (Map<String, Object?> row) =>
-            Mail(row['rowid'] as int, row['text'] as String),
-        queryableName: 'mail',
-        isView: false);
-  }
-
-  @override
-  Future<void> insertMail(Mail mailInfo) async {
-    await _mailInsertionAdapter.insert(mailInfo, OnConflictStrategy.abort);
-  }
-
-  @override
-  Future<void> insertMails(List<Mail> mailInfo) async {
-    await _mailInsertionAdapter.insertList(mailInfo, OnConflictStrategy.abort);
-  }
-
-  @override
-  Future<void> updateMail(Mail mailInfo) async {
-    await _mailUpdateAdapter.update(mailInfo, OnConflictStrategy.abort);
-  }
-
-  @override
-  Future<void> updateMails(List<Mail> mailInfo) async {
-    await _mailUpdateAdapter.updateList(mailInfo, OnConflictStrategy.abort);
-  }
-
-  @override
-  Future<void> deleteMail(Mail mailInfo) async {
-    await _mailDeletionAdapter.delete(mailInfo);
-  }
-
-  @override
-  Future<void> deleteMails(List<Mail> mailInfo) async {
-    await _mailDeletionAdapter.deleteList(mailInfo);
-  }
-}
diff --git a/floor_common/test/integration/inheritance/dao_inheritance_test.g.dart b/floor_common/test/integration/inheritance/dao_inheritance_test.g.dart
deleted file mode 100644
index 58c86590..00000000
--- a/floor_common/test/integration/inheritance/dao_inheritance_test.g.dart
+++ /dev/null
@@ -1,144 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'dao_inheritance_test.dart';
-
-// **************************************************************************
-// FloorGenerator
-// **************************************************************************
-
-abstract class $TestDatabaseBuilderContract {
-  /// Adds migrations to the builder.
-  $TestDatabaseBuilderContract addMigrations(List<Migration> migrations);
-
-  /// Adds a database [Callback] to the builder.
-  $TestDatabaseBuilderContract addCallback(Callback callback);
-
-  /// Creates the database and initializes it.
-  Future<TestDatabase> build();
-}
-
-// ignore: avoid_classes_with_only_static_members
-class $FloorTestDatabase {
-  /// Creates a database builder for a persistent database.
-  /// Once a database is built, you should keep a reference to it and re-use it.
-  static $TestDatabaseBuilderContract databaseBuilder(String name) =>
-      _$TestDatabaseBuilder(name);
-
-  /// Creates a database builder for an in memory database.
-  /// Information stored in an in memory database disappears when the process is killed.
-  /// Once a database is built, you should keep a reference to it and re-use it.
-  static $TestDatabaseBuilderContract inMemoryDatabaseBuilder() =>
-      _$TestDatabaseBuilder(null);
-}
-
-class _$TestDatabaseBuilder implements $TestDatabaseBuilderContract {
-  _$TestDatabaseBuilder(this.name);
-
-  final String? name;
-
-  final List<Migration> _migrations = [];
-
-  Callback? _callback;
-
-  @override
-  $TestDatabaseBuilderContract addMigrations(List<Migration> migrations) {
-    _migrations.addAll(migrations);
-    return this;
-  }
-
-  @override
-  $TestDatabaseBuilderContract addCallback(Callback callback) {
-    _callback = callback;
-    return this;
-  }
-
-  @override
-  Future<TestDatabase> build() async {
-    final path = name != null
-        ? await sqfliteDatabaseFactory.getDatabasePath(name!)
-        : ':memory:';
-    final database = _$TestDatabase();
-    database.database = await database.open(
-      path,
-      _migrations,
-      _callback,
-    );
-    return database;
-  }
-}
-
-class _$TestDatabase extends TestDatabase {
-  _$TestDatabase([StreamController<String>? listener]) {
-    changeListener = listener ?? StreamController<String>.broadcast();
-  }
-
-  PersonDao? _personDaoInstance;
-
-  Future<sqflite.Database> open(
-    String path,
-    List<Migration> migrations, [
-    Callback? callback,
-  ]) async {
-    final databaseOptions = sqflite.OpenDatabaseOptions(
-      version: 1,
-      onConfigure: (database) async {
-        await database.execute('PRAGMA foreign_keys = ON');
-        await callback?.onConfigure?.call(database);
-      },
-      onOpen: (database) async {
-        await callback?.onOpen?.call(database);
-      },
-      onUpgrade: (database, startVersion, endVersion) async {
-        await MigrationAdapter.runMigrations(
-            database, startVersion, endVersion, migrations);
-
-        await callback?.onUpgrade?.call(database, startVersion, endVersion);
-      },
-      onCreate: (database, version) async {
-        await database.execute(
-            'CREATE TABLE IF NOT EXISTS `Person` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, PRIMARY KEY (`id`))');
-
-        await callback?.onCreate?.call(database, version);
-      },
-    );
-    return sqfliteDatabaseFactory.openDatabase(path, options: databaseOptions);
-  }
-
-  @override
-  PersonDao get personDao {
-    return _personDaoInstance ??= _$PersonDao(database, changeListener);
-  }
-}
-
-class _$PersonDao extends PersonDao {
-  _$PersonDao(
-    this.database,
-    this.changeListener,
-  )   : _queryAdapter = QueryAdapter(database),
-        _personInsertionAdapter = InsertionAdapter(
-            database,
-            'Person',
-            (Person item) =>
-                <String, Object?>{'id': item.id, 'name': item.name});
-
-  final sqflite.DatabaseExecutor database;
-
-  final StreamController<String> changeListener;
-
-  final QueryAdapter _queryAdapter;
-
-  final InsertionAdapter<Person> _personInsertionAdapter;
-
-  @override
-  Future<Person?> findPersonById(int id) async {
-    return _queryAdapter.query('SELECT * FROM Person WHERE id = ?1',
-        mapper: (Map<String, Object?> row) =>
-            Person(row['id'] as int, row['name'] as String),
-        arguments: [id]);
-  }
-
-  @override
-  Future<void> insertItem(Person item) async {
-    await _personInsertionAdapter.insert(item, OnConflictStrategy.abort);
-  }
-}
diff --git a/floor_common/test/integration/inheritance/entity_inheritance_test.g.dart b/floor_common/test/integration/inheritance/entity_inheritance_test.g.dart
deleted file mode 100644
index 2de28d1f..00000000
--- a/floor_common/test/integration/inheritance/entity_inheritance_test.g.dart
+++ /dev/null
@@ -1,170 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'entity_inheritance_test.dart';
-
-// **************************************************************************
-// FloorGenerator
-// **************************************************************************
-
-abstract class $TestDatabaseBuilderContract {
-  /// Adds migrations to the builder.
-  $TestDatabaseBuilderContract addMigrations(List<Migration> migrations);
-
-  /// Adds a database [Callback] to the builder.
-  $TestDatabaseBuilderContract addCallback(Callback callback);
-
-  /// Creates the database and initializes it.
-  Future<TestDatabase> build();
-}
-
-// ignore: avoid_classes_with_only_static_members
-class $FloorTestDatabase {
-  /// Creates a database builder for a persistent database.
-  /// Once a database is built, you should keep a reference to it and re-use it.
-  static $TestDatabaseBuilderContract databaseBuilder(String name) =>
-      _$TestDatabaseBuilder(name);
-
-  /// Creates a database builder for an in memory database.
-  /// Information stored in an in memory database disappears when the process is killed.
-  /// Once a database is built, you should keep a reference to it and re-use it.
-  static $TestDatabaseBuilderContract inMemoryDatabaseBuilder() =>
-      _$TestDatabaseBuilder(null);
-}
-
-class _$TestDatabaseBuilder implements $TestDatabaseBuilderContract {
-  _$TestDatabaseBuilder(this.name);
-
-  final String? name;
-
-  final List<Migration> _migrations = [];
-
-  Callback? _callback;
-
-  @override
-  $TestDatabaseBuilderContract addMigrations(List<Migration> migrations) {
-    _migrations.addAll(migrations);
-    return this;
-  }
-
-  @override
-  $TestDatabaseBuilderContract addCallback(Callback callback) {
-    _callback = callback;
-    return this;
-  }
-
-  @override
-  Future<TestDatabase> build() async {
-    final path = name != null
-        ? await sqfliteDatabaseFactory.getDatabasePath(name!)
-        : ':memory:';
-    final database = _$TestDatabase();
-    database.database = await database.open(
-      path,
-      _migrations,
-      _callback,
-    );
-    return database;
-  }
-}
-
-class _$TestDatabase extends TestDatabase {
-  _$TestDatabase([StreamController<String>? listener]) {
-    changeListener = listener ?? StreamController<String>.broadcast();
-  }
-
-  CommentDao? _commentDaoInstance;
-
-  Future<sqflite.Database> open(
-    String path,
-    List<Migration> migrations, [
-    Callback? callback,
-  ]) async {
-    final databaseOptions = sqflite.OpenDatabaseOptions(
-      version: 1,
-      onConfigure: (database) async {
-        await database.execute('PRAGMA foreign_keys = ON');
-        await callback?.onConfigure?.call(database);
-      },
-      onOpen: (database) async {
-        await callback?.onOpen?.call(database);
-      },
-      onUpgrade: (database, startVersion, endVersion) async {
-        await MigrationAdapter.runMigrations(
-            database, startVersion, endVersion, migrations);
-
-        await callback?.onUpgrade?.call(database, startVersion, endVersion);
-      },
-      onCreate: (database, version) async {
-        await database.execute(
-            'CREATE TABLE IF NOT EXISTS `comments` (`author` TEXT NOT NULL, `content` TEXT NOT NULL, `id` INTEGER NOT NULL, `create_time` TEXT NOT NULL, `update_time` TEXT, PRIMARY KEY (`id`))');
-
-        await callback?.onCreate?.call(database, version);
-      },
-    );
-    return sqfliteDatabaseFactory.openDatabase(path, options: databaseOptions);
-  }
-
-  @override
-  CommentDao get commentDao {
-    return _commentDaoInstance ??= _$CommentDao(database, changeListener);
-  }
-}
-
-class _$CommentDao extends CommentDao {
-  _$CommentDao(
-    this.database,
-    this.changeListener,
-  )   : _queryAdapter = QueryAdapter(database),
-        _commentInsertionAdapter = InsertionAdapter(
-            database,
-            'comments',
-            (Comment item) => <String, Object?>{
-                  'author': item.author,
-                  'content': item.content,
-                  'id': item.id,
-                  'create_time': item.createTime,
-                  'update_time': item.updateTime
-                }),
-        _commentDeletionAdapter = DeletionAdapter(
-            database,
-            'comments',
-            ['id'],
-            (Comment item) => <String, Object?>{
-                  'author': item.author,
-                  'content': item.content,
-                  'id': item.id,
-                  'create_time': item.createTime,
-                  'update_time': item.updateTime
-                });
-
-  final sqflite.DatabaseExecutor database;
-
-  final StreamController<String> changeListener;
-
-  final QueryAdapter _queryAdapter;
-
-  final InsertionAdapter<Comment> _commentInsertionAdapter;
-
-  final DeletionAdapter<Comment> _commentDeletionAdapter;
-
-  @override
-  Future<Comment?> findCommentById(int id) async {
-    return _queryAdapter.query('SELECT * FROM comments WHERE id = ?1',
-        mapper: (Map<String, Object?> row) => Comment(
-            row['id'] as int, row['author'] as String,
-            content: row['content'] as String,
-            createTime: row['create_time'] as String?,
-            updateTime: row['update_time'] as String?),
-        arguments: [id]);
-  }
-
-  @override
-  Future<void> addComment(Comment c) async {
-    await _commentInsertionAdapter.insert(c, OnConflictStrategy.abort);
-  }
-
-  @override
-  Future<void> removeComment(Comment c) async {
-    await _commentDeletionAdapter.delete(c);
-  }
-}
diff --git a/floor_common/test/integration/type_converter/order_database.g.dart b/floor_common/test/integration/type_converter/order_database.g.dart
deleted file mode 100644
index 3746ee41..00000000
--- a/floor_common/test/integration/type_converter/order_database.g.dart
+++ /dev/null
@@ -1,166 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'order_database.dart';
-
-// **************************************************************************
-// FloorGenerator
-// **************************************************************************
-
-abstract class $OrderDatabaseBuilderContract {
-  /// Adds migrations to the builder.
-  $OrderDatabaseBuilderContract addMigrations(List<Migration> migrations);
-
-  /// Adds a database [Callback] to the builder.
-  $OrderDatabaseBuilderContract addCallback(Callback callback);
-
-  /// Creates the database and initializes it.
-  Future<OrderDatabase> build();
-}
-
-// ignore: avoid_classes_with_only_static_members
-class $FloorOrderDatabase {
-  /// Creates a database builder for a persistent database.
-  /// Once a database is built, you should keep a reference to it and re-use it.
-  static $OrderDatabaseBuilderContract databaseBuilder(String name) =>
-      _$OrderDatabaseBuilder(name);
-
-  /// Creates a database builder for an in memory database.
-  /// Information stored in an in memory database disappears when the process is killed.
-  /// Once a database is built, you should keep a reference to it and re-use it.
-  static $OrderDatabaseBuilderContract inMemoryDatabaseBuilder() =>
-      _$OrderDatabaseBuilder(null);
-}
-
-class _$OrderDatabaseBuilder implements $OrderDatabaseBuilderContract {
-  _$OrderDatabaseBuilder(this.name);
-
-  final String? name;
-
-  final List<Migration> _migrations = [];
-
-  Callback? _callback;
-
-  @override
-  $OrderDatabaseBuilderContract addMigrations(List<Migration> migrations) {
-    _migrations.addAll(migrations);
-    return this;
-  }
-
-  @override
-  $OrderDatabaseBuilderContract addCallback(Callback callback) {
-    _callback = callback;
-    return this;
-  }
-
-  @override
-  Future<OrderDatabase> build() async {
-    final path = name != null
-        ? await sqfliteDatabaseFactory.getDatabasePath(name!)
-        : ':memory:';
-    final database = _$OrderDatabase();
-    database.database = await database.open(
-      path,
-      _migrations,
-      _callback,
-    );
-    return database;
-  }
-}
-
-class _$OrderDatabase extends OrderDatabase {
-  _$OrderDatabase([StreamController<String>? listener]) {
-    changeListener = listener ?? StreamController<String>.broadcast();
-  }
-
-  OrderDao? _orderDaoInstance;
-
-  Future<sqflite.Database> open(
-    String path,
-    List<Migration> migrations, [
-    Callback? callback,
-  ]) async {
-    final databaseOptions = sqflite.OpenDatabaseOptions(
-      version: 1,
-      onConfigure: (database) async {
-        await database.execute('PRAGMA foreign_keys = ON');
-        await callback?.onConfigure?.call(database);
-      },
-      onOpen: (database) async {
-        await callback?.onOpen?.call(database);
-      },
-      onUpgrade: (database, startVersion, endVersion) async {
-        await MigrationAdapter.runMigrations(
-            database, startVersion, endVersion, migrations);
-
-        await callback?.onUpgrade?.call(database, startVersion, endVersion);
-      },
-      onCreate: (database, version) async {
-        await database.execute(
-            'CREATE TABLE IF NOT EXISTS `Order` (`id` INTEGER NOT NULL, `date` INTEGER NOT NULL, PRIMARY KEY (`id`))');
-
-        await callback?.onCreate?.call(database, version);
-      },
-    );
-    return sqfliteDatabaseFactory.openDatabase(path, options: databaseOptions);
-  }
-
-  @override
-  OrderDao get orderDao {
-    return _orderDaoInstance ??= _$OrderDao(database, changeListener);
-  }
-}
-
-class _$OrderDao extends OrderDao {
-  _$OrderDao(
-    this.database,
-    this.changeListener,
-  )   : _queryAdapter = QueryAdapter(database),
-        _orderInsertionAdapter = InsertionAdapter(
-            database,
-            'Order',
-            (Order item) => <String, Object?>{
-                  'id': item.id,
-                  'date': _dateTimeConverter.encode(item.date)
-                });
-
-  final sqflite.DatabaseExecutor database;
-
-  final StreamController<String> changeListener;
-
-  final QueryAdapter _queryAdapter;
-
-  final InsertionAdapter<Order> _orderInsertionAdapter;
-
-  @override
-  Future<List<Order>> findOrdersByDate(DateTime date) async {
-    return _queryAdapter.queryList('SELECT * FROM `Order` WHERE date = ?1',
-        mapper: (Map<String, Object?> row) => Order(
-            row['id'] as int, _dateTimeConverter.decode(row['date'] as int)),
-        arguments: [_dateTimeConverter.encode(date)]);
-  }
-
-  @override
-  Future<List<Order>> findOrdersByDates(List<DateTime> dates) async {
-    const offset = 1;
-    final _sqliteVariablesForDates =
-        Iterable<String>.generate(dates.length, (i) => '?${i + offset}')
-            .join(',');
-    return _queryAdapter.queryList(
-        'SELECT * FROM `Order` WHERE date IN (' +
-            _sqliteVariablesForDates +
-            ')',
-        mapper: (Map<String, Object?> row) => Order(
-            row['id'] as int, _dateTimeConverter.decode(row['date'] as int)),
-        arguments: [
-          ...dates.map((element) => _dateTimeConverter.encode(element))
-        ]);
-  }
-
-  @override
-  Future<void> insertOrder(Order order) async {
-    await _orderInsertionAdapter.insert(order, OnConflictStrategy.abort);
-  }
-}
-
-// ignore_for_file: unused_element
-final _dateTimeConverter = DateTimeConverter();
diff --git a/floor_common/test/integration/view/view_test.g.dart b/floor_common/test/integration/view/view_test.g.dart
deleted file mode 100644
index b168d05e..00000000
--- a/floor_common/test/integration/view/view_test.g.dart
+++ /dev/null
@@ -1,521 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'view_test.dart';
-
-// **************************************************************************
-// FloorGenerator
-// **************************************************************************
-
-abstract class $ViewTestDatabaseBuilderContract {
-  /// Adds migrations to the builder.
-  $ViewTestDatabaseBuilderContract addMigrations(List<Migration> migrations);
-
-  /// Adds a database [Callback] to the builder.
-  $ViewTestDatabaseBuilderContract addCallback(Callback callback);
-
-  /// Creates the database and initializes it.
-  Future<ViewTestDatabase> build();
-}
-
-// ignore: avoid_classes_with_only_static_members
-class $FloorViewTestDatabase {
-  /// Creates a database builder for a persistent database.
-  /// Once a database is built, you should keep a reference to it and re-use it.
-  static $ViewTestDatabaseBuilderContract databaseBuilder(String name) =>
-      _$ViewTestDatabaseBuilder(name);
-
-  /// Creates a database builder for an in memory database.
-  /// Information stored in an in memory database disappears when the process is killed.
-  /// Once a database is built, you should keep a reference to it and re-use it.
-  static $ViewTestDatabaseBuilderContract inMemoryDatabaseBuilder() =>
-      _$ViewTestDatabaseBuilder(null);
-}
-
-class _$ViewTestDatabaseBuilder implements $ViewTestDatabaseBuilderContract {
-  _$ViewTestDatabaseBuilder(this.name);
-
-  final String? name;
-
-  final List<Migration> _migrations = [];
-
-  Callback? _callback;
-
-  @override
-  $ViewTestDatabaseBuilderContract addMigrations(List<Migration> migrations) {
-    _migrations.addAll(migrations);
-    return this;
-  }
-
-  @override
-  $ViewTestDatabaseBuilderContract addCallback(Callback callback) {
-    _callback = callback;
-    return this;
-  }
-
-  @override
-  Future<ViewTestDatabase> build() async {
-    final path = name != null
-        ? await sqfliteDatabaseFactory.getDatabasePath(name!)
-        : ':memory:';
-    final database = _$ViewTestDatabase();
-    database.database = await database.open(
-      path,
-      _migrations,
-      _callback,
-    );
-    return database;
-  }
-}
-
-class _$ViewTestDatabase extends ViewTestDatabase {
-  _$ViewTestDatabase([StreamController<String>? listener]) {
-    changeListener = listener ?? StreamController<String>.broadcast();
-  }
-
-  PersonDao? _personDaoInstance;
-
-  DogDao? _dogDaoInstance;
-
-  NameDao? _nameDaoInstance;
-
-  Future<sqflite.Database> open(
-    String path,
-    List<Migration> migrations, [
-    Callback? callback,
-  ]) async {
-    final databaseOptions = sqflite.OpenDatabaseOptions(
-      version: 1,
-      onConfigure: (database) async {
-        await database.execute('PRAGMA foreign_keys = ON');
-        await callback?.onConfigure?.call(database);
-      },
-      onOpen: (database) async {
-        await callback?.onOpen?.call(database);
-      },
-      onUpgrade: (database, startVersion, endVersion) async {
-        await MigrationAdapter.runMigrations(
-            database, startVersion, endVersion, migrations);
-
-        await callback?.onUpgrade?.call(database, startVersion, endVersion);
-      },
-      onCreate: (database, version) async {
-        await database.execute(
-            'CREATE TABLE IF NOT EXISTS `person` (`id` INTEGER, `custom_name` TEXT NOT NULL, PRIMARY KEY (`id`))');
-        await database.execute(
-            'CREATE TABLE IF NOT EXISTS `dog` (`id` INTEGER, `name` TEXT NOT NULL, `nick_name` TEXT NOT NULL, `owner_id` INTEGER NOT NULL, FOREIGN KEY (`owner_id`) REFERENCES `person` (`id`) ON UPDATE NO ACTION ON DELETE CASCADE, PRIMARY KEY (`id`))');
-        await database.execute(
-            'CREATE INDEX `index_person_custom_name` ON `person` (`custom_name`)');
-        await database.execute(
-            'CREATE VIEW IF NOT EXISTS `names` AS SELECT custom_name as name FROM person UNION SELECT name from dog');
-        await database.execute(
-            'CREATE VIEW IF NOT EXISTS `multiline_query_names` AS     SELECT custom_name as name \n    FROM person \n    UNION SELECT name from dog\n  ');
-
-        await callback?.onCreate?.call(database, version);
-      },
-    );
-    return sqfliteDatabaseFactory.openDatabase(path, options: databaseOptions);
-  }
-
-  @override
-  PersonDao get personDao {
-    return _personDaoInstance ??= _$PersonDao(database, changeListener);
-  }
-
-  @override
-  DogDao get dogDao {
-    return _dogDaoInstance ??= _$DogDao(database, changeListener);
-  }
-
-  @override
-  NameDao get nameDao {
-    return _nameDaoInstance ??= _$NameDao(database, changeListener);
-  }
-}
-
-class _$PersonDao extends PersonDao {
-  _$PersonDao(
-    this.database,
-    this.changeListener,
-  )   : _queryAdapter = QueryAdapter(database, changeListener),
-        _personInsertionAdapter = InsertionAdapter(
-            database,
-            'person',
-            (Person item) =>
-                <String, Object?>{'id': item.id, 'custom_name': item.name},
-            changeListener),
-        _personUpdateAdapter = UpdateAdapter(
-            database,
-            'person',
-            ['id'],
-            (Person item) =>
-                <String, Object?>{'id': item.id, 'custom_name': item.name},
-            changeListener),
-        _personDeletionAdapter = DeletionAdapter(
-            database,
-            'person',
-            ['id'],
-            (Person item) =>
-                <String, Object?>{'id': item.id, 'custom_name': item.name},
-            changeListener);
-
-  final sqflite.DatabaseExecutor database;
-
-  final StreamController<String> changeListener;
-
-  final QueryAdapter _queryAdapter;
-
-  final InsertionAdapter<Person> _personInsertionAdapter;
-
-  final UpdateAdapter<Person> _personUpdateAdapter;
-
-  final DeletionAdapter<Person> _personDeletionAdapter;
-
-  @override
-  Future<List<Person>> findAllPersons() async {
-    return _queryAdapter.queryList('SELECT * FROM person',
-        mapper: (Map<String, Object?> row) =>
-            Person(row['id'] as int?, row['custom_name'] as String));
-  }
-
-  @override
-  Stream<List<Person>> findAllPersonsAsStream() {
-    return _queryAdapter.queryListStream('SELECT * FROM person',
-        mapper: (Map<String, Object?> row) =>
-            Person(row['id'] as int?, row['custom_name'] as String),
-        queryableName: 'person',
-        isView: false);
-  }
-
-  @override
-  Future<Person?> findPersonById(int id) async {
-    return _queryAdapter.query('SELECT * FROM person WHERE id = ?1',
-        mapper: (Map<String, Object?> row) =>
-            Person(row['id'] as int?, row['custom_name'] as String),
-        arguments: [id]);
-  }
-
-  @override
-  Stream<Person?> findPersonByIdAsStream(int id) {
-    return _queryAdapter.queryStream('SELECT * FROM person WHERE id = ?1',
-        mapper: (Map<String, Object?> row) =>
-            Person(row['id'] as int?, row['custom_name'] as String),
-        arguments: [id],
-        queryableName: 'person',
-        isView: false);
-  }
-
-  @override
-  Stream<int?> uniqueRecordsCountAsStream() {
-    return _queryAdapter.queryStream('SELECT DISTINCT COUNT(id) FROM person',
-        mapper: (Map<String, Object?> row) => row.values.first as int,
-        queryableName: 'person',
-        isView: false);
-  }
-
-  @override
-  Future<Person?> findPersonByIdAndName(
-    int id,
-    String name,
-  ) async {
-    return _queryAdapter.query(
-        'SELECT * FROM person WHERE id = ?1 AND custom_name = ?2',
-        mapper: (Map<String, Object?> row) =>
-            Person(row['id'] as int?, row['custom_name'] as String),
-        arguments: [id, name]);
-  }
-
-  @override
-  Future<List<Person>> findPersonsWithIds(List<int> ids) async {
-    const offset = 1;
-    final _sqliteVariablesForIds =
-        Iterable<String>.generate(ids.length, (i) => '?${i + offset}')
-            .join(',');
-    return _queryAdapter.queryList(
-        'SELECT * FROM person WHERE id IN (' + _sqliteVariablesForIds + ')',
-        mapper: (Map<String, Object?> row) =>
-            Person(row['id'] as int?, row['custom_name'] as String),
-        arguments: [...ids]);
-  }
-
-  @override
-  Future<List<Person>> findPersonsWithNames(List<String> names) async {
-    const offset = 1;
-    final _sqliteVariablesForNames =
-        Iterable<String>.generate(names.length, (i) => '?${i + offset}')
-            .join(',');
-    return _queryAdapter.queryList(
-        'SELECT * FROM person WHERE custom_name IN (' +
-            _sqliteVariablesForNames +
-            ')',
-        mapper: (Map<String, Object?> row) =>
-            Person(row['id'] as int?, row['custom_name'] as String),
-        arguments: [...names]);
-  }
-
-  @override
-  Future<List<Person>> findPersonsWithNamesComplex(
-    int reference,
-    List<String> names,
-    List<String> moreNames,
-  ) async {
-    int offset = 2;
-    final _sqliteVariablesForNames =
-        Iterable<String>.generate(names.length, (i) => '?${i + offset}')
-            .join(',');
-    offset += names.length;
-    final _sqliteVariablesForMoreNames =
-        Iterable<String>.generate(moreNames.length, (i) => '?${i + offset}')
-            .join(',');
-    return _queryAdapter.queryList(
-        'SELECT * FROM person WHERE custom_name IN (' +
-            _sqliteVariablesForNames +
-            ') AND id>=?1 OR custom_name IN (' +
-            _sqliteVariablesForMoreNames +
-            ') AND id<=?1',
-        mapper: (Map<String, Object?> row) =>
-            Person(row['id'] as int?, row['custom_name'] as String),
-        arguments: [reference, ...names, ...moreNames]);
-  }
-
-  @override
-  Future<List<Person>> findPersonsWithNamesLike(String name) async {
-    return _queryAdapter.queryList(
-        'SELECT * FROM person WHERE custom_name LIKE ?1',
-        mapper: (Map<String, Object?> row) =>
-            Person(row['id'] as int?, row['custom_name'] as String),
-        arguments: [name]);
-  }
-
-  @override
-  Future<List<Person>> findPersonsWithEmptyName() async {
-    return _queryAdapter.queryList(
-        'SELECT * FROM person WHERE custom_name == \'\'',
-        mapper: (Map<String, Object?> row) =>
-            Person(row['id'] as int?, row['custom_name'] as String));
-  }
-
-  @override
-  Future<void> deleteAllPersons() async {
-    await _queryAdapter.queryNoReturn('DELETE FROM person');
-  }
-
-  @override
-  Stream<List<Dog>> findAllDogsOfPersonAsStream(int id) {
-    return _queryAdapter.queryListStream(
-        'SELECT * FROM dog WHERE owner_id = ?1',
-        mapper: (Map<String, Object?> row) => Dog(
-            row['id'] as int?,
-            row['name'] as String,
-            row['nick_name'] as String,
-            row['owner_id'] as int),
-        arguments: [id],
-        queryableName: 'dog',
-        isView: false);
-  }
-
-  @override
-  Future<void> insertPerson(Person person) async {
-    await _personInsertionAdapter.insert(person, OnConflictStrategy.replace);
-  }
-
-  @override
-  Future<void> insertPersons(List<Person> persons) async {
-    await _personInsertionAdapter.insertList(persons, OnConflictStrategy.abort);
-  }
-
-  @override
-  Future<int> insertPersonWithReturn(Person person) {
-    return _personInsertionAdapter.insertAndReturnId(
-        person, OnConflictStrategy.abort);
-  }
-
-  @override
-  Future<List<int>> insertPersonsWithReturn(List<Person> persons) {
-    return _personInsertionAdapter.insertListAndReturnIds(
-        persons, OnConflictStrategy.abort);
-  }
-
-  @override
-  Future<void> updatePerson(Person person) async {
-    await _personUpdateAdapter.update(person, OnConflictStrategy.abort);
-  }
-
-  @override
-  Future<void> updatePersons(List<Person> persons) async {
-    await _personUpdateAdapter.updateList(persons, OnConflictStrategy.abort);
-  }
-
-  @override
-  Future<int> updatePersonWithReturn(Person person) {
-    return _personUpdateAdapter.updateAndReturnChangedRows(
-        person, OnConflictStrategy.abort);
-  }
-
-  @override
-  Future<int> updatePersonsWithReturn(List<Person> persons) {
-    return _personUpdateAdapter.updateListAndReturnChangedRows(
-        persons, OnConflictStrategy.abort);
-  }
-
-  @override
-  Future<void> deletePerson(Person person) async {
-    await _personDeletionAdapter.delete(person);
-  }
-
-  @override
-  Future<void> deletePersons(List<Person> person) async {
-    await _personDeletionAdapter.deleteList(person);
-  }
-
-  @override
-  Future<int> deletePersonWithReturn(Person person) {
-    return _personDeletionAdapter.deleteAndReturnChangedRows(person);
-  }
-
-  @override
-  Future<int> deletePersonsWithReturn(List<Person> persons) {
-    return _personDeletionAdapter.deleteListAndReturnChangedRows(persons);
-  }
-
-  @override
-  Future<void> replacePersons(List<Person> persons) async {
-    if (database is sqflite.Transaction) {
-      await super.replacePersons(persons);
-    } else {
-      await (database as sqflite.Database)
-          .transaction<void>((transaction) async {
-        final transactionDatabase = _$ViewTestDatabase(changeListener)
-          ..database = transaction;
-        await transactionDatabase.personDao.replacePersons(persons);
-      });
-    }
-  }
-
-  @override
-  Future<List<Person>> replacePersonsAndReturn(List<Person> persons) async {
-    if (database is sqflite.Transaction) {
-      return super.replacePersonsAndReturn(persons);
-    } else {
-      return (database as sqflite.Database)
-          .transaction<List<Person>>((transaction) async {
-        final transactionDatabase = _$ViewTestDatabase(changeListener)
-          ..database = transaction;
-        return transactionDatabase.personDao.replacePersonsAndReturn(persons);
-      });
-    }
-  }
-}
-
-class _$DogDao extends DogDao {
-  _$DogDao(
-    this.database,
-    this.changeListener,
-  )   : _queryAdapter = QueryAdapter(database),
-        _dogInsertionAdapter = InsertionAdapter(
-            database,
-            'dog',
-            (Dog item) => <String, Object?>{
-                  'id': item.id,
-                  'name': item.name,
-                  'nick_name': item.nickName,
-                  'owner_id': item.ownerId
-                },
-            changeListener);
-
-  final sqflite.DatabaseExecutor database;
-
-  final StreamController<String> changeListener;
-
-  final QueryAdapter _queryAdapter;
-
-  final InsertionAdapter<Dog> _dogInsertionAdapter;
-
-  @override
-  Future<Dog?> findDogForPersonId(int id) async {
-    return _queryAdapter.query('SELECT * FROM dog WHERE owner_id = ?1',
-        mapper: (Map<String, Object?> row) => Dog(
-            row['id'] as int?,
-            row['name'] as String,
-            row['nick_name'] as String,
-            row['owner_id'] as int),
-        arguments: [id]);
-  }
-
-  @override
-  Future<List<Dog>> findAllDogs() async {
-    return _queryAdapter.queryList('SELECT * FROM dog',
-        mapper: (Map<String, Object?> row) => Dog(
-            row['id'] as int?,
-            row['name'] as String,
-            row['nick_name'] as String,
-            row['owner_id'] as int));
-  }
-
-  @override
-  Future<void> insertDog(Dog dog) async {
-    await _dogInsertionAdapter.insert(dog, OnConflictStrategy.abort);
-  }
-}
-
-class _$NameDao extends NameDao {
-  _$NameDao(
-    this.database,
-    this.changeListener,
-  ) : _queryAdapter = QueryAdapter(database, changeListener);
-
-  final sqflite.DatabaseExecutor database;
-
-  final StreamController<String> changeListener;
-
-  final QueryAdapter _queryAdapter;
-
-  @override
-  Future<List<Name>> findAllNames() async {
-    return _queryAdapter.queryList('SELECT * FROM names ORDER BY name ASC',
-        mapper: (Map<String, Object?> row) => Name(row['name'] as String));
-  }
-
-  @override
-  Stream<List<Name>> findAllNamesAsStream() {
-    return _queryAdapter.queryListStream(
-        'SELECT * FROM names ORDER BY name ASC',
-        mapper: (Map<String, Object?> row) => Name(row['name'] as String),
-        queryableName: 'names',
-        isView: true);
-  }
-
-  @override
-  Future<Name?> findExactName(String name) async {
-    return _queryAdapter.query('SELECT * FROM names WHERE name = ?1',
-        mapper: (Map<String, Object?> row) => Name(row['name'] as String),
-        arguments: [name]);
-  }
-
-  @override
-  Future<List<Name>> findNamesLike(String suffix) async {
-    return _queryAdapter.queryList(
-        'SELECT * FROM names WHERE name LIKE ?1 ORDER BY name ASC',
-        mapper: (Map<String, Object?> row) => Name(row['name'] as String),
-        arguments: [suffix]);
-  }
-
-  @override
-  Future<List<Name>> findNamesMatchingBoth(
-    String prefix,
-    String suffix,
-  ) async {
-    return _queryAdapter.queryList(
-        'SELECT * FROM names WHERE name LIKE ?2 AND name LIKE ?1 ORDER BY name ASC',
-        mapper: (Map<String, Object?> row) => Name(row['name'] as String),
-        arguments: [prefix, suffix]);
-  }
-
-  @override
-  Future<MultilineQueryName?> findMultilineQueryName(String name) async {
-    return _queryAdapter.query(
-        'SELECT * FROM multiline_query_names WHERE name = ?1',
-        mapper: (Map<String, Object?> row) =>
-            MultilineQueryName(row['name'] as String),
-        arguments: [name]);
-  }
-}