Inject mock streams via .connect constructor

moor/build.yaml

@@ -4,4 +4,5 @@ targets:
       moor_generator:
         options:
           override_hash_and_equals_in_result_sets: true
-          use_column_name_as_json_key_when_defined_in_moor_file: true
+          use_column_name_as_json_key_when_defined_in_moor_file: true
+          generate_connect_constructor: true

moor/example/example.g.dart

@@ -832,6 +832,7 @@ class $IngredientInRecipesTable extends IngredientInRecipes
 
 abstract class _$Database extends GeneratedDatabase {
   _$Database(QueryExecutor e) : super(SqlTypeSystem.defaultInstance, e);
+  _$Database.connect(DatabaseConnection c) : super.connect(c);
   $CategoriesTable _categories;
   $CategoriesTable get categories => _categories ??= $CategoriesTable(this);
   $RecipesTable _recipes;

moor/test/custom_queries_test.dart

@@ -12,7 +12,9 @@ void main() {
   setUp(() {
     executor = MockExecutor();
     streamQueries = MockStreamQueries();
-    db = TodoDb(executor)..streamQueries = streamQueries;
+
+    final connection = createConnection(executor, streamQueries);
+    db = TodoDb.connect(connection);
   });
 
   group('compiled custom queries', () {

moor/test/data/tables/custom_tables.g.dart

@@ -877,6 +877,7 @@ class Mytable extends Table with TableInfo<Mytable, MytableData> {
 
 abstract class _$CustomTablesDb extends GeneratedDatabase {
   _$CustomTablesDb(QueryExecutor e) : super(SqlTypeSystem.defaultInstance, e);
+  _$CustomTablesDb.connect(DatabaseConnection c) : super.connect(c);
   NoIds _noIds;
   NoIds get noIds => _noIds ??= NoIds(this);
   WithDefaults _withDefaults;

moor/test/data/tables/todos.dart

@@ -100,6 +100,7 @@ class CustomConverter extends TypeConverter<MyCustomObject, String> {
 )
 class TodoDb extends _$TodoDb {
   TodoDb(QueryExecutor e) : super(e);
+  TodoDb.connect(DatabaseConnection connection) : super.connect(connection);
 
   @override
   MigrationStrategy get migration => MigrationStrategy();

moor/test/data/tables/todos.g.dart

@@ -1287,6 +1287,7 @@ class $PureDefaultsTable extends PureDefaults
 
 abstract class _$TodoDb extends GeneratedDatabase {
   _$TodoDb(QueryExecutor e) : super(SqlTypeSystem.defaultInstance, e);
+  _$TodoDb.connect(DatabaseConnection c) : super.connect(c);
   $TodosTableTable _todosTable;
   $TodosTableTable get todosTable => _todosTable ??= $TodosTableTable(this);
   $CategoriesTable _categories;

moor/test/data/utils/mocks.dart

@@ -81,3 +81,9 @@ abstract class SqlExecutorAsClass {
 }
 
 class MockQueryExecutor extends Mock implements SqlExecutorAsClass {}
+
+DatabaseConnection createConnection(QueryExecutor executor,
+    [StreamQueryStore streams]) {
+  return DatabaseConnection(
+      SqlTypeSystem.defaultInstance, executor, streams ?? StreamQueryStore());
+}

moor/test/delete_test.dart

@@ -14,7 +14,9 @@ void main() {
   setUp(() {
     executor = MockExecutor();
     streamQueries = MockStreamQueries();
-    db = TodoDb(executor)..streamQueries = streamQueries;
+
+    final connection = createConnection(executor, streamQueries);
+    db = TodoDb.connect(connection);
   });
 
   group('Generates DELETE statements', () {

moor/test/insert_test.dart

@@ -12,7 +12,9 @@ void main() {
   setUp(() {
     executor = MockExecutor();
     streamQueries = MockStreamQueries();
-    db = TodoDb(executor)..streamQueries = streamQueries;
+
+    final connection = createConnection(executor, streamQueries);
+    db = TodoDb.connect(connection);
   });
 
   test('generates insert statements', () async {

moor/test/transactions_test.dart

@@ -28,7 +28,9 @@ void main() {
   setUp(() {
     executor = MockExecutor();
     streamQueries = MockStreamQueries();
-    db = TodoDb(executor)..streamQueries = streamQueries;
+
+    final connection = createConnection(executor, streamQueries);
+    db = TodoDb.connect(connection);
   });
 
   test("transactions don't allow creating streams", () {

moor/test/update_test.dart

@@ -14,7 +14,9 @@ void main() {
   setUp(() {
     executor = MockExecutor();
     streamQueries = MockStreamQueries();
-    db = TodoDb(executor)..streamQueries = streamQueries;
+
+    final connection = createConnection(executor, streamQueries);
+    db = TodoDb.connect(connection);
   });
 
   group('generates update statements', () {

moor_generator/lib/src/backends/build/options.dart

@@ -7,6 +7,7 @@ class MoorOptions {
   final bool skipVerificationCode;
   final bool useDataClassNameForCompanions;
   final bool useColumnNameAsJsonKeyWhenDefinedInMoorFile;
+  final bool generateConnectConstructor;
 
   const MoorOptions(
       {this.generateFromJsonStringConstructor = false,
@@ -14,7 +15,8 @@ class MoorOptions {
       this.compactQueryMethods = false,
       this.skipVerificationCode = false,
       this.useDataClassNameForCompanions = false,
-      this.useColumnNameAsJsonKeyWhenDefinedInMoorFile = false});
+      this.useColumnNameAsJsonKeyWhenDefinedInMoorFile = false,
+      this.generateConnectConstructor = false});
 
   factory MoorOptions.fromBuilder(Map<String, dynamic> config) {
     final writeFromString =
@@ -37,6 +39,9 @@ class MoorOptions {
                 as bool ??
             false;
 
+    final generateConnectConstructor =
+        config['generate_connect_constructor'] as bool ?? false;
+
     return MoorOptions(
       generateFromJsonStringConstructor: writeFromString,
       overrideHashAndEqualsInResultSets: overrideInResultSets,
@@ -45,6 +50,7 @@ class MoorOptions {
       useDataClassNameForCompanions: dataClassNamesForCompanions,
       useColumnNameAsJsonKeyWhenDefinedInMoorFile:
           useColumnNameAsJsonKeyForMoor,
+      generateConnectConstructor: generateConnectConstructor,
     );
   }
 }

moor_generator/lib/src/writer/database_writer.dart

@@ -21,10 +21,15 @@ class DatabaseWriter {
     final dbScope = scope.child();
 
     final className = '_\$${db.fromClass.name}';
-    dbScope.leaf().write(
-        'abstract class $className extends GeneratedDatabase {\n'
+    final firstLeaf = dbScope.leaf();
+    firstLeaf.write('abstract class $className extends GeneratedDatabase {\n'
         '$className(QueryExecutor e) : super(SqlTypeSystem.defaultInstance, e); \n');
 
+    if (dbScope.options.generateConnectConstructor) {
+      firstLeaf.write(
+          '$className.connect(DatabaseConnection c): super.connect(c); \n');
+    }
+
     final tableGetters = <String>[];
 
     for (var table in db.allTables) {