diff --git a/docs/lib/snippets/_shared/todo_tables.drift.dart b/docs/lib/snippets/_shared/todo_tables.drift.dart index a1b8fa332..d9a172537 100644 --- a/docs/lib/snippets/_shared/todo_tables.drift.dart +++ b/docs/lib/snippets/_shared/todo_tables.drift.dart @@ -311,7 +311,7 @@ class TodoItemsCompanion extends i0.UpdateCompanion { } } -typedef $$TodoItemsTableInsertCompanionBuilder = i1.TodoItemsCompanion +typedef $$TodoItemsTableCreateCompanionBuilder = i1.TodoItemsCompanion Function({ i0.Value id, required String title, @@ -334,8 +334,7 @@ class $$TodoItemsTableTableManager extends i0.RootTableManager< i1.TodoItem, i1.$$TodoItemsTableFilterComposer, i1.$$TodoItemsTableOrderingComposer, - $$TodoItemsTableProcessedTableManager, - $$TodoItemsTableInsertCompanionBuilder, + $$TodoItemsTableCreateCompanionBuilder, $$TodoItemsTableUpdateCompanionBuilder> { $$TodoItemsTableTableManager( i0.GeneratedDatabase db, i1.$TodoItemsTable table) @@ -346,9 +345,7 @@ class $$TodoItemsTableTableManager extends i0.RootTableManager< i1.$$TodoItemsTableFilterComposer(i0.ComposerState(db, table)), orderingComposer: i1.$$TodoItemsTableOrderingComposer(i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$TodoItemsTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value id = const i0.Value.absent(), i0.Value title = const i0.Value.absent(), i0.Value content = const i0.Value.absent(), @@ -362,7 +359,7 @@ class $$TodoItemsTableTableManager extends i0.RootTableManager< category: category, dueDate: dueDate, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ i0.Value id = const i0.Value.absent(), required String title, required String content, @@ -379,18 +376,6 @@ class $$TodoItemsTableTableManager extends i0.RootTableManager< )); } -class $$TodoItemsTableProcessedTableManager extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i1.$TodoItemsTable, - i1.TodoItem, - i1.$$TodoItemsTableFilterComposer, - i1.$$TodoItemsTableOrderingComposer, - $$TodoItemsTableProcessedTableManager, - $$TodoItemsTableInsertCompanionBuilder, - $$TodoItemsTableUpdateCompanionBuilder> { - $$TodoItemsTableProcessedTableManager(super.$state); -} - class $$TodoItemsTableFilterComposer extends i0.FilterComposer { $$TodoItemsTableFilterComposer(super.$state); @@ -652,7 +637,7 @@ class CategoriesCompanion extends i0.UpdateCompanion { } } -typedef $$CategoriesTableInsertCompanionBuilder = i1.CategoriesCompanion +typedef $$CategoriesTableCreateCompanionBuilder = i1.CategoriesCompanion Function({ i0.Value id, required String name, @@ -669,8 +654,7 @@ class $$CategoriesTableTableManager extends i0.RootTableManager< i1.Category, i1.$$CategoriesTableFilterComposer, i1.$$CategoriesTableOrderingComposer, - $$CategoriesTableProcessedTableManager, - $$CategoriesTableInsertCompanionBuilder, + $$CategoriesTableCreateCompanionBuilder, $$CategoriesTableUpdateCompanionBuilder> { $$CategoriesTableTableManager( i0.GeneratedDatabase db, i1.$CategoriesTable table) @@ -681,9 +665,7 @@ class $$CategoriesTableTableManager extends i0.RootTableManager< i1.$$CategoriesTableFilterComposer(i0.ComposerState(db, table)), orderingComposer: i1.$$CategoriesTableOrderingComposer(i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$CategoriesTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value id = const i0.Value.absent(), i0.Value name = const i0.Value.absent(), }) => @@ -691,7 +673,7 @@ class $$CategoriesTableTableManager extends i0.RootTableManager< id: id, name: name, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ i0.Value id = const i0.Value.absent(), required String name, }) => @@ -702,18 +684,6 @@ class $$CategoriesTableTableManager extends i0.RootTableManager< )); } -class $$CategoriesTableProcessedTableManager extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i1.$CategoriesTable, - i1.Category, - i1.$$CategoriesTableFilterComposer, - i1.$$CategoriesTableOrderingComposer, - $$CategoriesTableProcessedTableManager, - $$CategoriesTableInsertCompanionBuilder, - $$CategoriesTableUpdateCompanionBuilder> { - $$CategoriesTableProcessedTableManager(super.$state); -} - class $$CategoriesTableFilterComposer extends i0.FilterComposer { $$CategoriesTableFilterComposer(super.$state); @@ -922,7 +892,7 @@ class UsersCompanion extends i0.UpdateCompanion { } } -typedef $$UsersTableInsertCompanionBuilder = i1.UsersCompanion Function({ +typedef $$UsersTableCreateCompanionBuilder = i1.UsersCompanion Function({ i0.Value id, required DateTime birthDate, }); @@ -937,8 +907,7 @@ class $$UsersTableTableManager extends i0.RootTableManager< i1.User, i1.$$UsersTableFilterComposer, i1.$$UsersTableOrderingComposer, - $$UsersTableProcessedTableManager, - $$UsersTableInsertCompanionBuilder, + $$UsersTableCreateCompanionBuilder, $$UsersTableUpdateCompanionBuilder> { $$UsersTableTableManager(i0.GeneratedDatabase db, i1.$UsersTable table) : super(i0.TableManagerState( @@ -948,8 +917,7 @@ class $$UsersTableTableManager extends i0.RootTableManager< i1.$$UsersTableFilterComposer(i0.ComposerState(db, table)), orderingComposer: i1.$$UsersTableOrderingComposer(i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => $$UsersTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value id = const i0.Value.absent(), i0.Value birthDate = const i0.Value.absent(), }) => @@ -957,7 +925,7 @@ class $$UsersTableTableManager extends i0.RootTableManager< id: id, birthDate: birthDate, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ i0.Value id = const i0.Value.absent(), required DateTime birthDate, }) => @@ -968,18 +936,6 @@ class $$UsersTableTableManager extends i0.RootTableManager< )); } -class $$UsersTableProcessedTableManager extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i1.$UsersTable, - i1.User, - i1.$$UsersTableFilterComposer, - i1.$$UsersTableOrderingComposer, - $$UsersTableProcessedTableManager, - $$UsersTableInsertCompanionBuilder, - $$UsersTableUpdateCompanionBuilder> { - $$UsersTableProcessedTableManager(super.$state); -} - class $$UsersTableFilterComposer extends i0.FilterComposer { $$UsersTableFilterComposer(super.$state); diff --git a/docs/lib/snippets/modular/custom_types/drift_table.drift.dart b/docs/lib/snippets/modular/custom_types/drift_table.drift.dart index 91ad5a68b..eaaf66c41 100644 --- a/docs/lib/snippets/modular/custom_types/drift_table.drift.dart +++ b/docs/lib/snippets/modular/custom_types/drift_table.drift.dart @@ -231,7 +231,7 @@ class PeriodicRemindersCompanion } } -typedef $PeriodicRemindersInsertCompanionBuilder = i1.PeriodicRemindersCompanion +typedef $PeriodicRemindersCreateCompanionBuilder = i1.PeriodicRemindersCompanion Function({ i0.Value id, required Duration frequency, @@ -250,8 +250,7 @@ class $PeriodicRemindersTableManager extends i0.RootTableManager< i1.PeriodicReminder, i1.$PeriodicRemindersFilterComposer, i1.$PeriodicRemindersOrderingComposer, - $PeriodicRemindersProcessedTableManager, - $PeriodicRemindersInsertCompanionBuilder, + $PeriodicRemindersCreateCompanionBuilder, $PeriodicRemindersUpdateCompanionBuilder> { $PeriodicRemindersTableManager( i0.GeneratedDatabase db, i1.PeriodicReminders table) @@ -262,9 +261,7 @@ class $PeriodicRemindersTableManager extends i0.RootTableManager< i1.$PeriodicRemindersFilterComposer(i0.ComposerState(db, table)), orderingComposer: i1 .$PeriodicRemindersOrderingComposer(i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => - $PeriodicRemindersProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value id = const i0.Value.absent(), i0.Value frequency = const i0.Value.absent(), i0.Value reminder = const i0.Value.absent(), @@ -274,7 +271,7 @@ class $PeriodicRemindersTableManager extends i0.RootTableManager< frequency: frequency, reminder: reminder, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ i0.Value id = const i0.Value.absent(), required Duration frequency, required String reminder, @@ -287,18 +284,6 @@ class $PeriodicRemindersTableManager extends i0.RootTableManager< )); } -class $PeriodicRemindersProcessedTableManager extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i1.PeriodicReminders, - i1.PeriodicReminder, - i1.$PeriodicRemindersFilterComposer, - i1.$PeriodicRemindersOrderingComposer, - $PeriodicRemindersProcessedTableManager, - $PeriodicRemindersInsertCompanionBuilder, - $PeriodicRemindersUpdateCompanionBuilder> { - $PeriodicRemindersProcessedTableManager(super.$state); -} - class $PeriodicRemindersFilterComposer extends i0.FilterComposer { $PeriodicRemindersFilterComposer(super.$state); diff --git a/docs/lib/snippets/modular/custom_types/table.drift.dart b/docs/lib/snippets/modular/custom_types/table.drift.dart index 55e34a85e..894040a76 100644 --- a/docs/lib/snippets/modular/custom_types/table.drift.dart +++ b/docs/lib/snippets/modular/custom_types/table.drift.dart @@ -229,7 +229,7 @@ class PeriodicRemindersCompanion } } -typedef $$PeriodicRemindersTableInsertCompanionBuilder +typedef $$PeriodicRemindersTableCreateCompanionBuilder = i1.PeriodicRemindersCompanion Function({ i0.Value id, i0.Value frequency, @@ -248,8 +248,7 @@ class $$PeriodicRemindersTableTableManager extends i0.RootTableManager< i1.PeriodicReminder, i1.$$PeriodicRemindersTableFilterComposer, i1.$$PeriodicRemindersTableOrderingComposer, - $$PeriodicRemindersTableProcessedTableManager, - $$PeriodicRemindersTableInsertCompanionBuilder, + $$PeriodicRemindersTableCreateCompanionBuilder, $$PeriodicRemindersTableUpdateCompanionBuilder> { $$PeriodicRemindersTableTableManager( i0.GeneratedDatabase db, i1.$PeriodicRemindersTable table) @@ -260,9 +259,7 @@ class $$PeriodicRemindersTableTableManager extends i0.RootTableManager< i0.ComposerState(db, table)), orderingComposer: i1.$$PeriodicRemindersTableOrderingComposer( i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$PeriodicRemindersTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value id = const i0.Value.absent(), i0.Value frequency = const i0.Value.absent(), i0.Value reminder = const i0.Value.absent(), @@ -272,7 +269,7 @@ class $$PeriodicRemindersTableTableManager extends i0.RootTableManager< frequency: frequency, reminder: reminder, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ i0.Value id = const i0.Value.absent(), i0.Value frequency = const i0.Value.absent(), required String reminder, @@ -285,19 +282,6 @@ class $$PeriodicRemindersTableTableManager extends i0.RootTableManager< )); } -class $$PeriodicRemindersTableProcessedTableManager - extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i1.$PeriodicRemindersTable, - i1.PeriodicReminder, - i1.$$PeriodicRemindersTableFilterComposer, - i1.$$PeriodicRemindersTableOrderingComposer, - $$PeriodicRemindersTableProcessedTableManager, - $$PeriodicRemindersTableInsertCompanionBuilder, - $$PeriodicRemindersTableUpdateCompanionBuilder> { - $$PeriodicRemindersTableProcessedTableManager(super.$state); -} - class $$PeriodicRemindersTableFilterComposer extends i0 .FilterComposer { $$PeriodicRemindersTableFilterComposer(super.$state); diff --git a/docs/lib/snippets/modular/drift/example.drift.dart b/docs/lib/snippets/modular/drift/example.drift.dart index 5bec1e02a..6f8b92acf 100644 --- a/docs/lib/snippets/modular/drift/example.drift.dart +++ b/docs/lib/snippets/modular/drift/example.drift.dart @@ -268,7 +268,7 @@ class TodosCompanion extends i0.UpdateCompanion { } } -typedef $TodosInsertCompanionBuilder = i1.TodosCompanion Function({ +typedef $TodosCreateCompanionBuilder = i1.TodosCompanion Function({ i0.Value id, required String title, required String content, @@ -287,8 +287,7 @@ class $TodosTableManager extends i0.RootTableManager< i1.Todo, i1.$TodosFilterComposer, i1.$TodosOrderingComposer, - $TodosProcessedTableManager, - $TodosInsertCompanionBuilder, + $TodosCreateCompanionBuilder, $TodosUpdateCompanionBuilder> { $TodosTableManager(i0.GeneratedDatabase db, i1.Todos table) : super(i0.TableManagerState( @@ -298,8 +297,7 @@ class $TodosTableManager extends i0.RootTableManager< i1.$TodosFilterComposer(i0.ComposerState(db, table)), orderingComposer: i1.$TodosOrderingComposer(i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => $TodosProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value id = const i0.Value.absent(), i0.Value title = const i0.Value.absent(), i0.Value content = const i0.Value.absent(), @@ -311,7 +309,7 @@ class $TodosTableManager extends i0.RootTableManager< content: content, category: category, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ i0.Value id = const i0.Value.absent(), required String title, required String content, @@ -326,18 +324,6 @@ class $TodosTableManager extends i0.RootTableManager< )); } -class $TodosProcessedTableManager extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i1.Todos, - i1.Todo, - i1.$TodosFilterComposer, - i1.$TodosOrderingComposer, - $TodosProcessedTableManager, - $TodosInsertCompanionBuilder, - $TodosUpdateCompanionBuilder> { - $TodosProcessedTableManager(super.$state); -} - class $TodosFilterComposer extends i0.FilterComposer { $TodosFilterComposer(super.$state); @@ -595,7 +581,7 @@ class CategoriesCompanion extends i0.UpdateCompanion { } } -typedef $CategoriesInsertCompanionBuilder = i1.CategoriesCompanion Function({ +typedef $CategoriesCreateCompanionBuilder = i1.CategoriesCompanion Function({ i0.Value id, required String description, }); @@ -610,8 +596,7 @@ class $CategoriesTableManager extends i0.RootTableManager< i1.Category, i1.$CategoriesFilterComposer, i1.$CategoriesOrderingComposer, - $CategoriesProcessedTableManager, - $CategoriesInsertCompanionBuilder, + $CategoriesCreateCompanionBuilder, $CategoriesUpdateCompanionBuilder> { $CategoriesTableManager(i0.GeneratedDatabase db, i1.Categories table) : super(i0.TableManagerState( @@ -621,8 +606,7 @@ class $CategoriesTableManager extends i0.RootTableManager< i1.$CategoriesFilterComposer(i0.ComposerState(db, table)), orderingComposer: i1.$CategoriesOrderingComposer(i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => $CategoriesProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value id = const i0.Value.absent(), i0.Value description = const i0.Value.absent(), }) => @@ -630,7 +614,7 @@ class $CategoriesTableManager extends i0.RootTableManager< id: id, description: description, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ i0.Value id = const i0.Value.absent(), required String description, }) => @@ -641,18 +625,6 @@ class $CategoriesTableManager extends i0.RootTableManager< )); } -class $CategoriesProcessedTableManager extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i1.Categories, - i1.Category, - i1.$CategoriesFilterComposer, - i1.$CategoriesOrderingComposer, - $CategoriesProcessedTableManager, - $CategoriesInsertCompanionBuilder, - $CategoriesUpdateCompanionBuilder> { - $CategoriesProcessedTableManager(super.$state); -} - class $CategoriesFilterComposer extends i0.FilterComposer { $CategoriesFilterComposer(super.$state); diff --git a/docs/lib/snippets/modular/drift/with_existing.drift.dart b/docs/lib/snippets/modular/drift/with_existing.drift.dart index 78603063e..9a82a92a6 100644 --- a/docs/lib/snippets/modular/drift/with_existing.drift.dart +++ b/docs/lib/snippets/modular/drift/with_existing.drift.dart @@ -119,7 +119,7 @@ class UsersCompanion extends i0.UpdateCompanion { } } -typedef $UsersInsertCompanionBuilder = i2.UsersCompanion Function({ +typedef $UsersCreateCompanionBuilder = i2.UsersCompanion Function({ i0.Value id, required String name, }); @@ -134,8 +134,7 @@ class $UsersTableManager extends i0.RootTableManager< i1.User, i2.$UsersFilterComposer, i2.$UsersOrderingComposer, - $UsersProcessedTableManager, - $UsersInsertCompanionBuilder, + $UsersCreateCompanionBuilder, $UsersUpdateCompanionBuilder> { $UsersTableManager(i0.GeneratedDatabase db, i2.Users table) : super(i0.TableManagerState( @@ -145,8 +144,7 @@ class $UsersTableManager extends i0.RootTableManager< i2.$UsersFilterComposer(i0.ComposerState(db, table)), orderingComposer: i2.$UsersOrderingComposer(i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => $UsersProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value id = const i0.Value.absent(), i0.Value name = const i0.Value.absent(), }) => @@ -154,7 +152,7 @@ class $UsersTableManager extends i0.RootTableManager< id: id, name: name, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ i0.Value id = const i0.Value.absent(), required String name, }) => @@ -165,18 +163,6 @@ class $UsersTableManager extends i0.RootTableManager< )); } -class $UsersProcessedTableManager extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i2.Users, - i1.User, - i2.$UsersFilterComposer, - i2.$UsersOrderingComposer, - $UsersProcessedTableManager, - $UsersInsertCompanionBuilder, - $UsersUpdateCompanionBuilder> { - $UsersProcessedTableManager(super.$state); -} - class $UsersFilterComposer extends i0.FilterComposer { $UsersFilterComposer(super.$state); @@ -403,7 +389,7 @@ class FriendsCompanion extends i0.UpdateCompanion { } } -typedef $FriendsInsertCompanionBuilder = i2.FriendsCompanion Function({ +typedef $FriendsCreateCompanionBuilder = i2.FriendsCompanion Function({ required int userA, required int userB, i0.Value rowid, @@ -420,8 +406,7 @@ class $FriendsTableManager extends i0.RootTableManager< i2.Friend, i2.$FriendsFilterComposer, i2.$FriendsOrderingComposer, - $FriendsProcessedTableManager, - $FriendsInsertCompanionBuilder, + $FriendsCreateCompanionBuilder, $FriendsUpdateCompanionBuilder> { $FriendsTableManager(i0.GeneratedDatabase db, i2.Friends table) : super(i0.TableManagerState( @@ -431,8 +416,7 @@ class $FriendsTableManager extends i0.RootTableManager< i2.$FriendsFilterComposer(i0.ComposerState(db, table)), orderingComposer: i2.$FriendsOrderingComposer(i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => $FriendsProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value userA = const i0.Value.absent(), i0.Value userB = const i0.Value.absent(), i0.Value rowid = const i0.Value.absent(), @@ -442,7 +426,7 @@ class $FriendsTableManager extends i0.RootTableManager< userB: userB, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ required int userA, required int userB, i0.Value rowid = const i0.Value.absent(), @@ -455,18 +439,6 @@ class $FriendsTableManager extends i0.RootTableManager< )); } -class $FriendsProcessedTableManager extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i2.Friends, - i2.Friend, - i2.$FriendsFilterComposer, - i2.$FriendsOrderingComposer, - $FriendsProcessedTableManager, - $FriendsInsertCompanionBuilder, - $FriendsUpdateCompanionBuilder> { - $FriendsProcessedTableManager(super.$state); -} - class $FriendsFilterComposer extends i0.FilterComposer { $FriendsFilterComposer(super.$state); diff --git a/docs/lib/snippets/modular/many_to_many/json.drift.dart b/docs/lib/snippets/modular/many_to_many/json.drift.dart index 9d5b43f7f..24393e3a8 100644 --- a/docs/lib/snippets/modular/many_to_many/json.drift.dart +++ b/docs/lib/snippets/modular/many_to_many/json.drift.dart @@ -219,7 +219,7 @@ class ShoppingCartsCompanion extends i0.UpdateCompanion { } } -typedef $$ShoppingCartsTableInsertCompanionBuilder = i2.ShoppingCartsCompanion +typedef $$ShoppingCartsTableCreateCompanionBuilder = i2.ShoppingCartsCompanion Function({ i0.Value id, required i3.ShoppingCartEntries entries, @@ -236,8 +236,7 @@ class $$ShoppingCartsTableTableManager extends i0.RootTableManager< i2.ShoppingCart, i2.$$ShoppingCartsTableFilterComposer, i2.$$ShoppingCartsTableOrderingComposer, - $$ShoppingCartsTableProcessedTableManager, - $$ShoppingCartsTableInsertCompanionBuilder, + $$ShoppingCartsTableCreateCompanionBuilder, $$ShoppingCartsTableUpdateCompanionBuilder> { $$ShoppingCartsTableTableManager( i0.GeneratedDatabase db, i2.$ShoppingCartsTable table) @@ -248,9 +247,7 @@ class $$ShoppingCartsTableTableManager extends i0.RootTableManager< .$$ShoppingCartsTableFilterComposer(i0.ComposerState(db, table)), orderingComposer: i2.$$ShoppingCartsTableOrderingComposer( i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$ShoppingCartsTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value id = const i0.Value.absent(), i0.Value entries = const i0.Value.absent(), }) => @@ -258,7 +255,7 @@ class $$ShoppingCartsTableTableManager extends i0.RootTableManager< id: id, entries: entries, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ i0.Value id = const i0.Value.absent(), required i3.ShoppingCartEntries entries, }) => @@ -269,19 +266,6 @@ class $$ShoppingCartsTableTableManager extends i0.RootTableManager< )); } -class $$ShoppingCartsTableProcessedTableManager - extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i2.$ShoppingCartsTable, - i2.ShoppingCart, - i2.$$ShoppingCartsTableFilterComposer, - i2.$$ShoppingCartsTableOrderingComposer, - $$ShoppingCartsTableProcessedTableManager, - $$ShoppingCartsTableInsertCompanionBuilder, - $$ShoppingCartsTableUpdateCompanionBuilder> { - $$ShoppingCartsTableProcessedTableManager(super.$state); -} - class $$ShoppingCartsTableFilterComposer extends i0.FilterComposer { $$ShoppingCartsTableFilterComposer(super.$state); diff --git a/docs/lib/snippets/modular/many_to_many/relational.drift.dart b/docs/lib/snippets/modular/many_to_many/relational.drift.dart index 010b4d4e8..db8eabee1 100644 --- a/docs/lib/snippets/modular/many_to_many/relational.drift.dart +++ b/docs/lib/snippets/modular/many_to_many/relational.drift.dart @@ -182,7 +182,7 @@ class ShoppingCartsCompanion extends i0.UpdateCompanion { } } -typedef $$ShoppingCartsTableInsertCompanionBuilder = i2.ShoppingCartsCompanion +typedef $$ShoppingCartsTableCreateCompanionBuilder = i2.ShoppingCartsCompanion Function({ i0.Value id, }); @@ -197,8 +197,7 @@ class $$ShoppingCartsTableTableManager extends i0.RootTableManager< i2.ShoppingCart, i2.$$ShoppingCartsTableFilterComposer, i2.$$ShoppingCartsTableOrderingComposer, - $$ShoppingCartsTableProcessedTableManager, - $$ShoppingCartsTableInsertCompanionBuilder, + $$ShoppingCartsTableCreateCompanionBuilder, $$ShoppingCartsTableUpdateCompanionBuilder> { $$ShoppingCartsTableTableManager( i0.GeneratedDatabase db, i2.$ShoppingCartsTable table) @@ -209,15 +208,13 @@ class $$ShoppingCartsTableTableManager extends i0.RootTableManager< .$$ShoppingCartsTableFilterComposer(i0.ComposerState(db, table)), orderingComposer: i2.$$ShoppingCartsTableOrderingComposer( i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$ShoppingCartsTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value id = const i0.Value.absent(), }) => i2.ShoppingCartsCompanion( id: id, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ i0.Value id = const i0.Value.absent(), }) => i2.ShoppingCartsCompanion.insert( @@ -226,19 +223,6 @@ class $$ShoppingCartsTableTableManager extends i0.RootTableManager< )); } -class $$ShoppingCartsTableProcessedTableManager - extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i2.$ShoppingCartsTable, - i2.ShoppingCart, - i2.$$ShoppingCartsTableFilterComposer, - i2.$$ShoppingCartsTableOrderingComposer, - $$ShoppingCartsTableProcessedTableManager, - $$ShoppingCartsTableInsertCompanionBuilder, - $$ShoppingCartsTableUpdateCompanionBuilder> { - $$ShoppingCartsTableProcessedTableManager(super.$state); -} - class $$ShoppingCartsTableFilterComposer extends i0.FilterComposer { $$ShoppingCartsTableFilterComposer(super.$state); @@ -465,7 +449,7 @@ class ShoppingCartEntriesCompanion } } -typedef $$ShoppingCartEntriesTableInsertCompanionBuilder +typedef $$ShoppingCartEntriesTableCreateCompanionBuilder = i2.ShoppingCartEntriesCompanion Function({ required int shoppingCart, required int item, @@ -484,8 +468,7 @@ class $$ShoppingCartEntriesTableTableManager extends i0.RootTableManager< i2.ShoppingCartEntry, i2.$$ShoppingCartEntriesTableFilterComposer, i2.$$ShoppingCartEntriesTableOrderingComposer, - $$ShoppingCartEntriesTableProcessedTableManager, - $$ShoppingCartEntriesTableInsertCompanionBuilder, + $$ShoppingCartEntriesTableCreateCompanionBuilder, $$ShoppingCartEntriesTableUpdateCompanionBuilder> { $$ShoppingCartEntriesTableTableManager( i0.GeneratedDatabase db, i2.$ShoppingCartEntriesTable table) @@ -496,9 +479,7 @@ class $$ShoppingCartEntriesTableTableManager extends i0.RootTableManager< i0.ComposerState(db, table)), orderingComposer: i2.$$ShoppingCartEntriesTableOrderingComposer( i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$ShoppingCartEntriesTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value shoppingCart = const i0.Value.absent(), i0.Value item = const i0.Value.absent(), i0.Value rowid = const i0.Value.absent(), @@ -508,7 +489,7 @@ class $$ShoppingCartEntriesTableTableManager extends i0.RootTableManager< item: item, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ required int shoppingCart, required int item, i0.Value rowid = const i0.Value.absent(), @@ -521,19 +502,6 @@ class $$ShoppingCartEntriesTableTableManager extends i0.RootTableManager< )); } -class $$ShoppingCartEntriesTableProcessedTableManager - extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i2.$ShoppingCartEntriesTable, - i2.ShoppingCartEntry, - i2.$$ShoppingCartEntriesTableFilterComposer, - i2.$$ShoppingCartEntriesTableOrderingComposer, - $$ShoppingCartEntriesTableProcessedTableManager, - $$ShoppingCartEntriesTableInsertCompanionBuilder, - $$ShoppingCartEntriesTableUpdateCompanionBuilder> { - $$ShoppingCartEntriesTableProcessedTableManager(super.$state); -} - class $$ShoppingCartEntriesTableFilterComposer extends i0 .FilterComposer { $$ShoppingCartEntriesTableFilterComposer(super.$state); diff --git a/docs/lib/snippets/modular/many_to_many/shared.drift.dart b/docs/lib/snippets/modular/many_to_many/shared.drift.dart index 09324c945..27c8a2a65 100644 --- a/docs/lib/snippets/modular/many_to_many/shared.drift.dart +++ b/docs/lib/snippets/modular/many_to_many/shared.drift.dart @@ -228,7 +228,7 @@ class BuyableItemsCompanion extends i0.UpdateCompanion { } } -typedef $$BuyableItemsTableInsertCompanionBuilder = i1.BuyableItemsCompanion +typedef $$BuyableItemsTableCreateCompanionBuilder = i1.BuyableItemsCompanion Function({ i0.Value id, required String description, @@ -247,8 +247,7 @@ class $$BuyableItemsTableTableManager extends i0.RootTableManager< i1.BuyableItem, i1.$$BuyableItemsTableFilterComposer, i1.$$BuyableItemsTableOrderingComposer, - $$BuyableItemsTableProcessedTableManager, - $$BuyableItemsTableInsertCompanionBuilder, + $$BuyableItemsTableCreateCompanionBuilder, $$BuyableItemsTableUpdateCompanionBuilder> { $$BuyableItemsTableTableManager( i0.GeneratedDatabase db, i1.$BuyableItemsTable table) @@ -259,9 +258,7 @@ class $$BuyableItemsTableTableManager extends i0.RootTableManager< i1.$$BuyableItemsTableFilterComposer(i0.ComposerState(db, table)), orderingComposer: i1 .$$BuyableItemsTableOrderingComposer(i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$BuyableItemsTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value id = const i0.Value.absent(), i0.Value description = const i0.Value.absent(), i0.Value price = const i0.Value.absent(), @@ -271,7 +268,7 @@ class $$BuyableItemsTableTableManager extends i0.RootTableManager< description: description, price: price, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ i0.Value id = const i0.Value.absent(), required String description, required int price, @@ -284,18 +281,6 @@ class $$BuyableItemsTableTableManager extends i0.RootTableManager< )); } -class $$BuyableItemsTableProcessedTableManager extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i1.$BuyableItemsTable, - i1.BuyableItem, - i1.$$BuyableItemsTableFilterComposer, - i1.$$BuyableItemsTableOrderingComposer, - $$BuyableItemsTableProcessedTableManager, - $$BuyableItemsTableInsertCompanionBuilder, - $$BuyableItemsTableUpdateCompanionBuilder> { - $$BuyableItemsTableProcessedTableManager(super.$state); -} - class $$BuyableItemsTableFilterComposer extends i0.FilterComposer { $$BuyableItemsTableFilterComposer(super.$state); diff --git a/docs/lib/snippets/modular/upserts.drift.dart b/docs/lib/snippets/modular/upserts.drift.dart index 17ad003be..017edc736 100644 --- a/docs/lib/snippets/modular/upserts.drift.dart +++ b/docs/lib/snippets/modular/upserts.drift.dart @@ -194,7 +194,7 @@ class WordsCompanion extends i0.UpdateCompanion { } } -typedef $$WordsTableInsertCompanionBuilder = i1.WordsCompanion Function({ +typedef $$WordsTableCreateCompanionBuilder = i1.WordsCompanion Function({ required String word, i0.Value usages, i0.Value rowid, @@ -211,8 +211,7 @@ class $$WordsTableTableManager extends i0.RootTableManager< i1.Word, i1.$$WordsTableFilterComposer, i1.$$WordsTableOrderingComposer, - $$WordsTableProcessedTableManager, - $$WordsTableInsertCompanionBuilder, + $$WordsTableCreateCompanionBuilder, $$WordsTableUpdateCompanionBuilder> { $$WordsTableTableManager(i0.GeneratedDatabase db, i1.$WordsTable table) : super(i0.TableManagerState( @@ -222,8 +221,7 @@ class $$WordsTableTableManager extends i0.RootTableManager< i1.$$WordsTableFilterComposer(i0.ComposerState(db, table)), orderingComposer: i1.$$WordsTableOrderingComposer(i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => $$WordsTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value word = const i0.Value.absent(), i0.Value usages = const i0.Value.absent(), i0.Value rowid = const i0.Value.absent(), @@ -233,7 +231,7 @@ class $$WordsTableTableManager extends i0.RootTableManager< usages: usages, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ required String word, i0.Value usages = const i0.Value.absent(), i0.Value rowid = const i0.Value.absent(), @@ -246,18 +244,6 @@ class $$WordsTableTableManager extends i0.RootTableManager< )); } -class $$WordsTableProcessedTableManager extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i1.$WordsTable, - i1.Word, - i1.$$WordsTableFilterComposer, - i1.$$WordsTableOrderingComposer, - $$WordsTableProcessedTableManager, - $$WordsTableInsertCompanionBuilder, - $$WordsTableUpdateCompanionBuilder> { - $$WordsTableProcessedTableManager(super.$state); -} - class $$WordsTableFilterComposer extends i0.FilterComposer { $$WordsTableFilterComposer(super.$state); @@ -553,7 +539,7 @@ class MatchResultsCompanion extends i0.UpdateCompanion { } } -typedef $$MatchResultsTableInsertCompanionBuilder = i1.MatchResultsCompanion +typedef $$MatchResultsTableCreateCompanionBuilder = i1.MatchResultsCompanion Function({ i0.Value id, required String teamA, @@ -574,8 +560,7 @@ class $$MatchResultsTableTableManager extends i0.RootTableManager< i1.MatchResult, i1.$$MatchResultsTableFilterComposer, i1.$$MatchResultsTableOrderingComposer, - $$MatchResultsTableProcessedTableManager, - $$MatchResultsTableInsertCompanionBuilder, + $$MatchResultsTableCreateCompanionBuilder, $$MatchResultsTableUpdateCompanionBuilder> { $$MatchResultsTableTableManager( i0.GeneratedDatabase db, i1.$MatchResultsTable table) @@ -586,9 +571,7 @@ class $$MatchResultsTableTableManager extends i0.RootTableManager< i1.$$MatchResultsTableFilterComposer(i0.ComposerState(db, table)), orderingComposer: i1 .$$MatchResultsTableOrderingComposer(i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$MatchResultsTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value id = const i0.Value.absent(), i0.Value teamA = const i0.Value.absent(), i0.Value teamB = const i0.Value.absent(), @@ -600,7 +583,7 @@ class $$MatchResultsTableTableManager extends i0.RootTableManager< teamB: teamB, teamAWon: teamAWon, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ i0.Value id = const i0.Value.absent(), required String teamA, required String teamB, @@ -615,18 +598,6 @@ class $$MatchResultsTableTableManager extends i0.RootTableManager< )); } -class $$MatchResultsTableProcessedTableManager extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i1.$MatchResultsTable, - i1.MatchResult, - i1.$$MatchResultsTableFilterComposer, - i1.$$MatchResultsTableOrderingComposer, - $$MatchResultsTableProcessedTableManager, - $$MatchResultsTableInsertCompanionBuilder, - $$MatchResultsTableUpdateCompanionBuilder> { - $$MatchResultsTableProcessedTableManager(super.$state); -} - class $$MatchResultsTableFilterComposer extends i0.FilterComposer { $$MatchResultsTableFilterComposer(super.$state); diff --git a/drift/example/main.g.dart b/drift/example/main.g.dart index cff8469b0..023648930 100644 --- a/drift/example/main.g.dart +++ b/drift/example/main.g.dart @@ -714,7 +714,7 @@ abstract class _$Database extends GeneratedDatabase { ]; } -typedef $$TodoCategoriesTableInsertCompanionBuilder = TodoCategoriesCompanion +typedef $$TodoCategoriesTableCreateCompanionBuilder = TodoCategoriesCompanion Function({ Value id, required String name, @@ -731,8 +731,7 @@ class $$TodoCategoriesTableTableManager extends RootTableManager< TodoCategory, $$TodoCategoriesTableFilterComposer, $$TodoCategoriesTableOrderingComposer, - $$TodoCategoriesTableProcessedTableManager, - $$TodoCategoriesTableInsertCompanionBuilder, + $$TodoCategoriesTableCreateCompanionBuilder, $$TodoCategoriesTableUpdateCompanionBuilder> { $$TodoCategoriesTableTableManager(_$Database db, $TodoCategoriesTable table) : super(TableManagerState( @@ -742,9 +741,7 @@ class $$TodoCategoriesTableTableManager extends RootTableManager< $$TodoCategoriesTableFilterComposer(ComposerState(db, table)), orderingComposer: $$TodoCategoriesTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$TodoCategoriesTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value id = const Value.absent(), Value name = const Value.absent(), }) => @@ -752,7 +749,7 @@ class $$TodoCategoriesTableTableManager extends RootTableManager< id: id, name: name, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value id = const Value.absent(), required String name, }) => @@ -763,18 +760,6 @@ class $$TodoCategoriesTableTableManager extends RootTableManager< )); } -class $$TodoCategoriesTableProcessedTableManager extends ProcessedTableManager< - _$Database, - $TodoCategoriesTable, - TodoCategory, - $$TodoCategoriesTableFilterComposer, - $$TodoCategoriesTableOrderingComposer, - $$TodoCategoriesTableProcessedTableManager, - $$TodoCategoriesTableInsertCompanionBuilder, - $$TodoCategoriesTableUpdateCompanionBuilder> { - $$TodoCategoriesTableProcessedTableManager(super.$state); -} - class $$TodoCategoriesTableFilterComposer extends FilterComposer<_$Database, $TodoCategoriesTable> { $$TodoCategoriesTableFilterComposer(super.$state); @@ -816,7 +801,7 @@ class $$TodoCategoriesTableOrderingComposer ColumnOrderings(column, joinBuilders: joinBuilders)); } -typedef $$TodoItemsTableInsertCompanionBuilder = TodoItemsCompanion Function({ +typedef $$TodoItemsTableCreateCompanionBuilder = TodoItemsCompanion Function({ Value id, required String title, Value content, @@ -835,8 +820,7 @@ class $$TodoItemsTableTableManager extends RootTableManager< TodoItem, $$TodoItemsTableFilterComposer, $$TodoItemsTableOrderingComposer, - $$TodoItemsTableProcessedTableManager, - $$TodoItemsTableInsertCompanionBuilder, + $$TodoItemsTableCreateCompanionBuilder, $$TodoItemsTableUpdateCompanionBuilder> { $$TodoItemsTableTableManager(_$Database db, $TodoItemsTable table) : super(TableManagerState( @@ -846,9 +830,7 @@ class $$TodoItemsTableTableManager extends RootTableManager< $$TodoItemsTableFilterComposer(ComposerState(db, table)), orderingComposer: $$TodoItemsTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$TodoItemsTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value id = const Value.absent(), Value title = const Value.absent(), Value content = const Value.absent(), @@ -860,7 +842,7 @@ class $$TodoItemsTableTableManager extends RootTableManager< content: content, categoryId: categoryId, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value id = const Value.absent(), required String title, Value content = const Value.absent(), @@ -875,18 +857,6 @@ class $$TodoItemsTableTableManager extends RootTableManager< )); } -class $$TodoItemsTableProcessedTableManager extends ProcessedTableManager< - _$Database, - $TodoItemsTable, - TodoItem, - $$TodoItemsTableFilterComposer, - $$TodoItemsTableOrderingComposer, - $$TodoItemsTableProcessedTableManager, - $$TodoItemsTableInsertCompanionBuilder, - $$TodoItemsTableUpdateCompanionBuilder> { - $$TodoItemsTableProcessedTableManager(super.$state); -} - class $$TodoItemsTableFilterComposer extends FilterComposer<_$Database, $TodoItemsTable> { $$TodoItemsTableFilterComposer(super.$state); diff --git a/drift/lib/src/runtime/manager/filter.dart b/drift/lib/src/runtime/manager/filter.dart index e620fff5c..a24b279bd 100644 --- a/drift/lib/src/runtime/manager/filter.dart +++ b/drift/lib/src/runtime/manager/filter.dart @@ -284,7 +284,14 @@ extension DateFilters on ColumnFilters { $composableFilter(column.isBetweenValues(lower, higher)); } -enum _BooleanOperator { and, or } +/// Enum of the possible boolean operators +enum _BooleanOperator { + /// Combine the existing filters to the new filter with an AND + and, + + /// Combine the existing filters to the new filter with an OR + or; +} /// This class is used to compose filters together /// diff --git a/drift/lib/src/runtime/manager/manager.dart b/drift/lib/src/runtime/manager/manager.dart index 248a1fcaa..939cbedf4 100644 --- a/drift/lib/src/runtime/manager/manager.dart +++ b/drift/lib/src/runtime/manager/manager.dart @@ -9,45 +9,27 @@ part 'filter.dart'; part 'composable.dart'; part 'ordering.dart'; -sealed class _StatementType { - const _StatementType(); -} - -class _SimpleResult extends _StatementType { - final SimpleSelectStatement statement; - const _SimpleResult(this.statement); -} - -class _JoinedResult extends _StatementType { - final JoinedSelectStatement statement; - - const _JoinedResult(this.statement); -} - /// Defines a class that holds the state for a [BaseTableManager] /// -/// It holds the state for manager of [T] table in [DB] database, used to return [DT] data classes/rows. -/// It holds the [FS] Filters and [OS] Orderings for the manager. +/// It holds the state for manager of [$Table] table in [$Database] database, used to return [$Dataclass] data classes/rows. +/// It holds the [$FilterComposer] Filters and [$OrderingComposer] Orderings for the manager. /// -/// It also holds the [CI] and [CU] functions that are used to create companion builders for inserting and updating data. +/// It also holds the [$CreateCompanionCallback] and [$UpdateCompanionCallback] functions that are used to create companion builders for inserting and updating data. /// E.G Instead of `CategoriesCompanion.insert(name: "School")` you would use `(f) => f(name: "School")` -/// -/// The [C] generic refers to the type of the child manager that will be created when a filter/ordering is applied - +@immutable class TableManagerState< - DB extends GeneratedDatabase, - T extends Table, - DT, - FS extends FilterComposer, - OS extends OrderingComposer, - C extends ProcessedTableManager, - CI extends Function, - CU extends Function> { + $Database extends GeneratedDatabase, + $Table extends Table, + $Dataclass, + $FilterComposer extends FilterComposer<$Database, $Table>, + $OrderingComposer extends OrderingComposer<$Database, $Table>, + $CreateCompanionCallback extends Function, + $UpdateCompanionCallback extends Function> { /// The database used to run the query. - final DB db; + final $Database db; - /// The table primary table from which to select from. - final T table; + /// The table that the manager is for + final $Table table; /// The expression that will be applied to the query final Expression? filter; @@ -72,51 +54,52 @@ class TableManagerState< /// The [FilterComposer] for this [TableManagerState] /// This class will be used to create filtering [Expression]s /// which will be applied to the statement when its eventually created - final FS filteringComposer; + final $FilterComposer filteringComposer; /// The [OrderingComposer] for this [TableManagerState] /// This class will be used to create [OrderingTerm]s /// which will be applied to the statement when its eventually created - final OS orderingComposer; - - /// This function is used internaly to return a new instance of the child manager - final C Function(TableManagerState) - _getChildManagerBuilder; + final $OrderingComposer orderingComposer; /// This function is passed to the user to create a companion /// for inserting data into the table - final CI _getInsertCompanionBuilder; + final $CreateCompanionCallback _createCompanionCallback; /// This function is passed to the user to create a companion /// for updating data in the table - final CU _getUpdateCompanionBuilder; + final $UpdateCompanionCallback _updateCompanionCallback; /// Defines a class which holds the state for a table manager /// It contains the database instance, the table instance, and any filters/orderings that will be applied to the query /// This is held in a seperate class than the [BaseTableManager] so that the state can be passed down from the root manager to the lower level managers /// /// This class is used internally by the [BaseTableManager] and should not be used directly - const TableManagerState( + + TableManagerState( {required this.db, required this.table, required this.filteringComposer, required this.orderingComposer, - required C Function(TableManagerState) - getChildManagerBuilder, - required CI getInsertCompanionBuilder, - required CU getUpdateCompanionBuilder, + required $CreateCompanionCallback createCompanionCallback, + required $UpdateCompanionCallback updateCompanionCallback, this.filter, this.distinct, this.limit, this.offset, this.orderingBuilders = const {}, this.joinBuilders = const {}}) - : _getChildManagerBuilder = getChildManagerBuilder, - _getInsertCompanionBuilder = getInsertCompanionBuilder, - _getUpdateCompanionBuilder = getUpdateCompanionBuilder; + : _createCompanionCallback = createCompanionCallback, + _updateCompanionCallback = updateCompanionCallback; /// Copy this state with the given values - TableManagerState copyWith({ + TableManagerState< + $Database, + $Table, + $Dataclass, + $FilterComposer, + $OrderingComposer, + $CreateCompanionCallback, + $UpdateCompanionCallback> copyWith({ bool? distinct, int? limit, int? offset, @@ -129,9 +112,8 @@ class TableManagerState< table: table, filteringComposer: filteringComposer, orderingComposer: orderingComposer, - getChildManagerBuilder: _getChildManagerBuilder, - getInsertCompanionBuilder: _getInsertCompanionBuilder, - getUpdateCompanionBuilder: _getUpdateCompanionBuilder, + createCompanionCallback: _createCompanionCallback, + updateCompanionCallback: _updateCompanionCallback, filter: filter ?? this.filter, joinBuilders: joinBuilders ?? this.joinBuilders, orderingBuilders: orderingBuilders ?? this.orderingBuilders, @@ -143,10 +125,11 @@ class TableManagerState< /// Helper for getting the table that's casted as a TableInfo /// This is needed due to dart's limitations with generics - TableInfo get _tableAsTableInfo => table as TableInfo; + TableInfo<$Table, $Dataclass> get _tableAsTableInfo => + table as TableInfo<$Table, $Dataclass>; /// Builds a select statement with the given target columns, or all columns if none are provided - _StatementType _buildSelectStatement( + _StatementType<$Table, $Dataclass> _buildSelectStatement( {Iterable? targetColumns}) { final joins = joinBuilders.map((e) => e.buildJoin()).toList(); @@ -169,19 +152,19 @@ class TableManagerState< return _SimpleResult(simpleStatement); } else { - JoinedSelectStatement joinedStatement; + JoinedSelectStatement<$Table, $Dataclass> joinedStatement; // If we are only selecting specific columns, we can use a selectOnly statement if (targetColumns != null) { joinedStatement = (db.selectOnly(_tableAsTableInfo, distinct: distinct ?? false) ..addColumns(targetColumns)); // Add the joins to the statement - joinedStatement = - joinedStatement.join(joins) as JoinedSelectStatement; + joinedStatement = joinedStatement.join(joins) + as JoinedSelectStatement<$Table, $Dataclass>; } else { joinedStatement = db .select(_tableAsTableInfo, distinct: distinct ?? false) - .join(joins) as JoinedSelectStatement; + .join(joins) as JoinedSelectStatement<$Table, $Dataclass>; } // Apply the expression to the statement if (filter != null) { @@ -200,7 +183,7 @@ class TableManagerState< } /// Build a select statement based on the manager state - Selectable
buildSelectStatement() { + Selectable<$Dataclass> buildSelectStatement() { final result = _buildSelectStatement(); switch (result) { case _SimpleResult(): @@ -211,8 +194,8 @@ class TableManagerState< } /// Build an update statement based on the manager state - UpdateStatement buildUpdateStatement() { - final UpdateStatement updateStatement; + UpdateStatement<$Table, $Dataclass> buildUpdateStatement() { + final UpdateStatement<$Table, $Dataclass> updateStatement; if (joinBuilders.isEmpty) { updateStatement = db.update(_tableAsTableInfo); if (filter != null) { @@ -221,8 +204,8 @@ class TableManagerState< } else { updateStatement = db.update(_tableAsTableInfo); for (var col in _tableAsTableInfo.primaryKey) { - final subquery = - _buildSelectStatement(targetColumns: [col]) as _JoinedResult; + final subquery = _buildSelectStatement(targetColumns: [col]) + as _JoinedResult<$Table, $Dataclass>; updateStatement.where((tbl) => col.isInQuery(subquery.statement)); } } @@ -280,8 +263,8 @@ class TableManagerState< } else { deleteStatement = db.delete(_tableAsTableInfo); for (var col in _tableAsTableInfo.primaryKey) { - final subquery = - _buildSelectStatement(targetColumns: [col]) as _JoinedResult; + final subquery = _buildSelectStatement(targetColumns: [col]) + as _JoinedResult<$Table, $Dataclass>; deleteStatement.where((tbl) => col.isInQuery(subquery.statement)); } } @@ -292,53 +275,86 @@ class TableManagerState< /// Base class for all table managers /// Most of this classes functionality is kept in a seperate [TableManagerState] class /// This is so that the state can be passed down to lower level managers +@immutable abstract class BaseTableManager< - DB extends GeneratedDatabase, - T extends Table, - DT, - FS extends FilterComposer, - OS extends OrderingComposer, - C extends ProcessedTableManager, - CI extends Function, - CU extends Function> - implements - MultiSelectable
, - SingleSelectable
, - SingleOrNullSelectable
{ + $Database extends GeneratedDatabase, + $Table extends Table, + $Dataclass, + $FilterComposer extends FilterComposer<$Database, $Table>, + $OrderingComposer extends OrderingComposer<$Database, $Table>, + $CreateCompanionCallback extends Function, + $UpdateCompanionCallback extends Function> extends Selectable<$Dataclass> { /// The state for this manager - final TableManagerState $state; + final TableManagerState< + $Database, + $Table, + $Dataclass, + $FilterComposer, + $OrderingComposer, + $CreateCompanionCallback, + $UpdateCompanionCallback> $state; /// Create a new [BaseTableManager] instance /// /// {@macro manager_internal_use_only} - const BaseTableManager(this.$state); + BaseTableManager(this.$state); /// Add a limit to the statement - C limit(int limit, {int? offset}) { - return $state - ._getChildManagerBuilder($state.copyWith(limit: limit, offset: offset)); + ProcessedTableManager< + $Database, + $Table, + $Dataclass, + $FilterComposer, + $OrderingComposer, + $CreateCompanionCallback, + $UpdateCompanionCallback> limit(int limit, {int? offset}) { + return ProcessedTableManager($state.copyWith(limit: limit, offset: offset)); } /// Add ordering to the statement - C orderBy(ComposableOrdering Function(OS o) o) { + ProcessedTableManager<$Database, $Table, $Dataclass, $FilterComposer, + $OrderingComposer, $CreateCompanionCallback, $UpdateCompanionCallback> + orderBy(ComposableOrdering Function($OrderingComposer o) o) { final orderings = o($state.orderingComposer); - return $state._getChildManagerBuilder($state.copyWith( + return ProcessedTableManager($state.copyWith( orderingBuilders: $state.orderingBuilders.union(orderings.orderingBuilders), joinBuilders: $state.joinBuilders.union(orderings.joinBuilders))); } /// Add a filter to the statement - C filter(ComposableFilter Function(FS f) f) { + /// + /// Any filters that were previously applied will be combined with an AND operator + ProcessedTableManager< + $Database, + $Table, + $Dataclass, + $FilterComposer, + $OrderingComposer, + $CreateCompanionCallback, + $UpdateCompanionCallback> filter( + ComposableFilter Function($FilterComposer f) f, + ) { + return _filter(f, _BooleanOperator.and); + } + + /// Add a filter to the statement + /// + /// The [combineWith] parameter can be used to specify how the new filter should be combined with the existing filter + ProcessedTableManager<$Database, $Table, $Dataclass, $FilterComposer, + $OrderingComposer, $CreateCompanionCallback, $UpdateCompanionCallback> + _filter(ComposableFilter Function($FilterComposer f) f, + _BooleanOperator combineWith) { final filter = f($state.filteringComposer); final combinedFilter = switch (($state.filter, filter.expression)) { (null, null) => null, (null, var filter) => filter, (var filter, null) => filter, - (var filter1, var filter2) => (filter1!) & (filter2!) + (var filter1, var filter2) => combineWith == _BooleanOperator.and + ? (filter1!) & (filter2!) + : (filter1!) | (filter2!) }; - - return $state._getChildManagerBuilder($state.copyWith( + return ProcessedTableManager($state.copyWith( filter: combinedFilter, joinBuilders: $state.joinBuilders.union(filter.joinBuilders))); } @@ -355,8 +371,9 @@ abstract class BaseTableManager< /// /// See also: [RootTableManager.replace], which does not require [filter] statements and /// supports setting fields back to null. - Future update(Insertable
Function(CU o) f) => - $state.buildUpdateStatement().write(f($state._getUpdateCompanionBuilder)); + Future update( + Insertable<$Dataclass> Function($UpdateCompanionCallback o) f) => + $state.buildUpdateStatement().write(f($state._updateCompanionCallback)); /// Return the count of rows matched by the built statement /// When counting rows, the query will only count distinct rows by default @@ -387,10 +404,11 @@ abstract class BaseTableManager< /// See also: [getSingleOrNull], which returns `null` instead of /// throwing if the query completes with no rows. /// - /// Uses the distinct flag to ensure that only distinct rows are returned + /// The [distinct] parameter (enabled by default) controls whether to generate + /// a `SELECT DISTINCT` query, removing duplicates from the result. @override - Future
getSingle() => - $state.copyWith(distinct: true).buildSelectStatement().getSingle(); + Future<$Dataclass> getSingle({bool distinct = true}) => + $state.copyWith(distinct: distinct).buildSelectStatement().getSingle(); /// Creates an auto-updating stream of this statement, similar to /// [watch]. However, it is assumed that the query will only emit @@ -398,18 +416,22 @@ abstract class BaseTableManager< /// `Stream`. If, at any point, the query emits no or more than one rows, /// an error will be added to the stream instead. /// - /// Uses the distinct flag to ensure that only distinct rows are returned + /// The [distinct] parameter (enabled by default) controls whether to generate + /// a `SELECT DISTINCT` query, removing duplicates from the result. @override - Stream
watchSingle() => - $state.copyWith(distinct: true).buildSelectStatement().watchSingle(); + Stream<$Dataclass> watchSingle({bool distinct = true}) => + $state.copyWith(distinct: distinct).buildSelectStatement().watchSingle(); /// Executes the statement and returns all rows as a list. /// /// Use [limit] and [offset] to limit the number of rows returned /// An offset will only be applied if a limit is also set - /// Set [distinct] to true to ensure that only distinct rows are returned + /// + /// The [distinct] parameter (disabled by default) controls whether to generate + /// a `SELECT DISTINCT` query, removing duplicates from the result. @override - Future> get({bool distinct = false, int? limit, int? offset}) => + Future> get( + {bool distinct = false, int? limit, int? offset}) => $state .copyWith(distinct: distinct, limit: limit, offset: offset) .buildSelectStatement() @@ -420,9 +442,12 @@ abstract class BaseTableManager< /// /// Use [limit] and [offset] to limit the number of rows returned /// An offset will only be applied if a limit is also set - /// Set [distinct] to true to ensure that only distinct rows are returned + /// + /// The [distinct] parameter (disabled by default) controls whether to generate + /// a `SELECT DISTINCT` query, removing duplicates from the result. @override - Stream> watch({bool distinct = false, int? limit, int? offset}) => + Stream> watch( + {bool distinct = false, int? limit, int? offset}) => $state .copyWith(distinct: distinct, limit: limit, offset: offset) .buildSelectStatement() @@ -435,10 +460,13 @@ abstract class BaseTableManager< /// See also: [getSingle], which can be used if the query will /// always evaluate to exactly one row. /// - /// Uses the distinct flag to ensure that only distinct rows are returned + /// The [distinct] parameter (enabled by default) controls whether to generate + /// a `SELECT DISTINCT` query, removing duplicates from the result. @override - Future getSingleOrNull() => - $state.copyWith(distinct: true).buildSelectStatement().getSingleOrNull(); + Future<$Dataclass?> getSingleOrNull({bool distinct = true}) => $state + .copyWith(distinct: distinct) + .buildSelectStatement() + .getSingleOrNull(); /// Creates an auto-updating stream of this statement, similar to /// [watch]. However, it is assumed that the query will only @@ -448,52 +476,63 @@ abstract class BaseTableManager< /// If the query emits zero rows at some point, `null` will be added /// to the stream instead. /// - /// Uses the distinct flag to ensure that only distinct rows are returned + /// The [distinct] parameter (enabled by default) controls whether to generate + /// a `SELECT DISTINCT` query, removing duplicates from the result. @override - Stream watchSingleOrNull() => $state - .copyWith(distinct: true) + Stream<$Dataclass?> watchSingleOrNull({bool distinct = true}) => $state + .copyWith(distinct: distinct) .buildSelectStatement() .watchSingleOrNull(); } -/// A table manager that exposes methods to a table manager that already has filters/orderings/limit applied -// As of now this is identical to [BaseTableManager] but it's kept seperate for future extensibility +/// A table manager that exposes methods to a table manager that already has +/// filters/orderings/limit applied. +/// +/// Some methods, like [RootTableManager.create] are intentionally not present +/// on [ProcessedTableManager] because combining e.g. [BaseTableManager.filter] +/// with [RootTableManager.create] makes little sense - there is no `WHERE` +/// clause on inserts. +/// By introducing a separate interface for managers with filters applied to +/// them, the API doesn't allow combining incompatible clauses and operations. +/// +// As of now this is identical to [BaseTableManager] but it's kept seperate for +// future extensibility. +@immutable class ProcessedTableManager< - DB extends GeneratedDatabase, - T extends Table, - D, - FS extends FilterComposer, - OS extends OrderingComposer, - C extends ProcessedTableManager, - CI extends Function, - CU extends Function> - extends BaseTableManager - implements - MultiSelectable, - SingleSelectable, - SingleOrNullSelectable { + $Database extends GeneratedDatabase, + $Table extends Table, + $Dataclass, + $FilterComposer extends FilterComposer<$Database, $Table>, + $OrderingComposer extends OrderingComposer<$Database, $Table>, + $CreateCompanionCallback extends Function, + $UpdateCompanionCallback extends Function> + extends BaseTableManager<$Database, $Table, $Dataclass, $FilterComposer, + $OrderingComposer, $CreateCompanionCallback, $UpdateCompanionCallback> { /// Create a new [ProcessedTableManager] instance @internal - const ProcessedTableManager(super.$state); + ProcessedTableManager(super.$state); } -/// A table manager with top level function for creating, reading, updating, and deleting items +/// A table manager with top level function for creating, reading, updating, and +/// deleting items. +@immutable abstract class RootTableManager< - DB extends GeneratedDatabase, - T extends Table, - D, - FS extends FilterComposer, - OS extends OrderingComposer, - C extends ProcessedTableManager, - CI extends Function, - CU extends Function> extends BaseTableManager { + $Database extends GeneratedDatabase, + $Table extends Table, + $Dataclass, + $FilterComposer extends FilterComposer<$Database, $Table>, + $OrderingComposer extends OrderingComposer<$Database, $Table>, + $CreateCompanionCallback extends Function, + $UpdateCompanionCallback extends Function> + extends BaseTableManager<$Database, $Table, $Dataclass, $FilterComposer, + $OrderingComposer, $CreateCompanionCallback, $UpdateCompanionCallback> { /// Create a new [RootTableManager] instance /// /// {@template manager_internal_use_only} /// This class is implemented by the code generator and should /// not be instantiated or extended manually. /// {@endtemplate} - const RootTableManager(super.$state); + RootTableManager(super.$state); /// Creates a new row in the table using the given function /// @@ -516,10 +555,12 @@ abstract class RootTableManager< /// /// If the table doesn't have a `rowid`, you can't rely on the return value. /// Still, the future will always complete with an error if the insert fails. - Future create(Insertable Function(CI o) f, - {InsertMode? mode, UpsertClause? onConflict}) { + Future create( + Insertable<$Dataclass> Function($CreateCompanionCallback o) f, + {InsertMode? mode, + UpsertClause<$Table, $Dataclass>? onConflict}) { return $state.db.into($state._tableAsTableInfo).insert( - f($state._getInsertCompanionBuilder), + f($state._createCompanionCallback), mode: mode, onConflict: onConflict); } @@ -532,10 +573,12 @@ abstract class RootTableManager< /// exception in that case. Use [createReturningOrNull] when performing an /// insert with an insert mode like [InsertMode.insertOrIgnore] or when using /// a [DoUpdate] with a `where` clause clause. - Future createReturning(Insertable Function(CI o) f, - {InsertMode? mode, UpsertClause? onConflict}) { + Future<$Dataclass> createReturning( + Insertable<$Dataclass> Function($CreateCompanionCallback o) f, + {InsertMode? mode, + UpsertClause<$Table, $Dataclass>? onConflict}) { return $state.db.into($state._tableAsTableInfo).insertReturning( - f($state._getInsertCompanionBuilder), + f($state._createCompanionCallback), mode: mode, onConflict: onConflict); } @@ -545,10 +588,12 @@ abstract class RootTableManager< /// When no row was inserted and no exception was thrown, for instance because /// [InsertMode.insertOrIgnore] was used or because the upsert clause had a /// `where` clause that didn't match, `null` is returned instead. - Future createReturningOrNull(Insertable Function(CI o) f, - {InsertMode? mode, UpsertClause? onConflict}) { + Future<$Dataclass?> createReturningOrNull( + Insertable<$Dataclass> Function($CreateCompanionCallback o) f, + {InsertMode? mode, + UpsertClause<$Table, $Dataclass>? onConflict}) { return $state.db.into($state._tableAsTableInfo).insertReturningOrNull( - f($state._getInsertCompanionBuilder), + f($state._createCompanionCallback), mode: mode, onConflict: onConflict); } @@ -565,10 +610,12 @@ abstract class RootTableManager< /// checks. /// [onConflict] can be used to create an upsert clause for engines that /// support it. For details and examples, see [InsertStatement.insert]. - Future bulkCreate(Iterable> Function(CI o) f, - {InsertMode? mode, UpsertClause? onConflict}) { + Future bulkCreate( + Iterable> Function($CreateCompanionCallback o) f, + {InsertMode? mode, + UpsertClause<$Table, $Dataclass>? onConflict}) { return $state.db.batch((b) => b.insertAll( - $state._tableAsTableInfo, f($state._getInsertCompanionBuilder), + $state._tableAsTableInfo, f($state._createCompanionCallback), mode: mode, onConflict: onConflict)); } @@ -584,7 +631,7 @@ abstract class RootTableManager< /// ignores such fields without changing them in the database. /// /// Returns true if a row was affected by this operation. - Future replace(Insertable entity) { + Future replace(Insertable<$Dataclass> entity) { return $state.db.update($state._tableAsTableInfo).replace(entity); } @@ -595,8 +642,24 @@ abstract class RootTableManager< /// the field exists, that default value will be used. Otherwise, the field /// will be reset to null. This behavior is different to [update], which simply /// ignores such fields without changing them in the database. - Future bulkReplace(Iterable> entities) { + Future bulkReplace(Iterable> entities) { return $state.db .batch((b) => b.replaceAll($state._tableAsTableInfo, entities)); } } + +/// This sealed class is used to hold a query which may or may not be a joined query +sealed class _StatementType { + const _StatementType(); +} + +class _SimpleResult extends _StatementType { + final SimpleSelectStatement statement; + const _SimpleResult(this.statement); +} + +class _JoinedResult extends _StatementType { + final JoinedSelectStatement statement; + + const _JoinedResult(this.statement); +} diff --git a/drift/test/extensions/geopoly_integration_test.g.dart b/drift/test/extensions/geopoly_integration_test.g.dart index 912e2456b..afbbeafc2 100644 --- a/drift/test/extensions/geopoly_integration_test.g.dart +++ b/drift/test/extensions/geopoly_integration_test.g.dart @@ -234,7 +234,7 @@ abstract class _$_GeopolyTestDatabase extends GeneratedDatabase { List get allSchemaEntities => [geopolyTest]; } -typedef $GeopolyTestInsertCompanionBuilder = GeopolyTestCompanion Function({ +typedef $GeopolyTestCreateCompanionBuilder = GeopolyTestCompanion Function({ Value shape, Value a, Value rowid, @@ -251,8 +251,7 @@ class $GeopolyTestTableManager extends RootTableManager< GeopolyTestData, $GeopolyTestFilterComposer, $GeopolyTestOrderingComposer, - $GeopolyTestProcessedTableManager, - $GeopolyTestInsertCompanionBuilder, + $GeopolyTestCreateCompanionBuilder, $GeopolyTestUpdateCompanionBuilder> { $GeopolyTestTableManager(_$_GeopolyTestDatabase db, GeopolyTest table) : super(TableManagerState( @@ -262,8 +261,7 @@ class $GeopolyTestTableManager extends RootTableManager< $GeopolyTestFilterComposer(ComposerState(db, table)), orderingComposer: $GeopolyTestOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => $GeopolyTestProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value shape = const Value.absent(), Value a = const Value.absent(), Value rowid = const Value.absent(), @@ -273,7 +271,7 @@ class $GeopolyTestTableManager extends RootTableManager< a: a, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value shape = const Value.absent(), Value a = const Value.absent(), Value rowid = const Value.absent(), @@ -286,18 +284,6 @@ class $GeopolyTestTableManager extends RootTableManager< )); } -class $GeopolyTestProcessedTableManager extends ProcessedTableManager< - _$_GeopolyTestDatabase, - GeopolyTest, - GeopolyTestData, - $GeopolyTestFilterComposer, - $GeopolyTestOrderingComposer, - $GeopolyTestProcessedTableManager, - $GeopolyTestInsertCompanionBuilder, - $GeopolyTestUpdateCompanionBuilder> { - $GeopolyTestProcessedTableManager(super.$state); -} - class $GeopolyTestFilterComposer extends FilterComposer<_$_GeopolyTestDatabase, GeopolyTest> { $GeopolyTestFilterComposer(super.$state); diff --git a/drift/test/generated/custom_tables.g.dart b/drift/test/generated/custom_tables.g.dart index d8706b1f1..94c4438a0 100644 --- a/drift/test/generated/custom_tables.g.dart +++ b/drift/test/generated/custom_tables.g.dart @@ -2024,7 +2024,7 @@ abstract class _$CustomTablesDb extends GeneratedDatabase { const DriftDatabaseOptions(storeDateTimeAsText: true); } -typedef $NoIdsInsertCompanionBuilder = NoIdsCompanion Function({ +typedef $NoIdsCreateCompanionBuilder = NoIdsCompanion Function({ required Uint8List payload, }); typedef $NoIdsUpdateCompanionBuilder = NoIdsCompanion Function({ @@ -2037,8 +2037,7 @@ class $NoIdsTableManager extends RootTableManager< NoIdRow, $NoIdsFilterComposer, $NoIdsOrderingComposer, - $NoIdsProcessedTableManager, - $NoIdsInsertCompanionBuilder, + $NoIdsCreateCompanionBuilder, $NoIdsUpdateCompanionBuilder> { $NoIdsTableManager(_$CustomTablesDb db, NoIds table) : super(TableManagerState( @@ -2046,14 +2045,13 @@ class $NoIdsTableManager extends RootTableManager< table: table, filteringComposer: $NoIdsFilterComposer(ComposerState(db, table)), orderingComposer: $NoIdsOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => $NoIdsProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value payload = const Value.absent(), }) => NoIdsCompanion( payload: payload, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ required Uint8List payload, }) => NoIdsCompanion.insert( @@ -2062,18 +2060,6 @@ class $NoIdsTableManager extends RootTableManager< )); } -class $NoIdsProcessedTableManager extends ProcessedTableManager< - _$CustomTablesDb, - NoIds, - NoIdRow, - $NoIdsFilterComposer, - $NoIdsOrderingComposer, - $NoIdsProcessedTableManager, - $NoIdsInsertCompanionBuilder, - $NoIdsUpdateCompanionBuilder> { - $NoIdsProcessedTableManager(super.$state); -} - class $NoIdsFilterComposer extends FilterComposer<_$CustomTablesDb, NoIds> { $NoIdsFilterComposer(super.$state); ColumnFilters get payload => $state.composableBuilder( @@ -2090,7 +2076,7 @@ class $NoIdsOrderingComposer extends OrderingComposer<_$CustomTablesDb, NoIds> { ColumnOrderings(column, joinBuilders: joinBuilders)); } -typedef $WithDefaultsInsertCompanionBuilder = WithDefaultsCompanion Function({ +typedef $WithDefaultsCreateCompanionBuilder = WithDefaultsCompanion Function({ Value a, Value b, Value rowid, @@ -2107,8 +2093,7 @@ class $WithDefaultsTableManager extends RootTableManager< WithDefault, $WithDefaultsFilterComposer, $WithDefaultsOrderingComposer, - $WithDefaultsProcessedTableManager, - $WithDefaultsInsertCompanionBuilder, + $WithDefaultsCreateCompanionBuilder, $WithDefaultsUpdateCompanionBuilder> { $WithDefaultsTableManager(_$CustomTablesDb db, WithDefaults table) : super(TableManagerState( @@ -2118,8 +2103,7 @@ class $WithDefaultsTableManager extends RootTableManager< $WithDefaultsFilterComposer(ComposerState(db, table)), orderingComposer: $WithDefaultsOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => $WithDefaultsProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value a = const Value.absent(), Value b = const Value.absent(), Value rowid = const Value.absent(), @@ -2129,7 +2113,7 @@ class $WithDefaultsTableManager extends RootTableManager< b: b, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value a = const Value.absent(), Value b = const Value.absent(), Value rowid = const Value.absent(), @@ -2142,18 +2126,6 @@ class $WithDefaultsTableManager extends RootTableManager< )); } -class $WithDefaultsProcessedTableManager extends ProcessedTableManager< - _$CustomTablesDb, - WithDefaults, - WithDefault, - $WithDefaultsFilterComposer, - $WithDefaultsOrderingComposer, - $WithDefaultsProcessedTableManager, - $WithDefaultsInsertCompanionBuilder, - $WithDefaultsUpdateCompanionBuilder> { - $WithDefaultsProcessedTableManager(super.$state); -} - class $WithDefaultsFilterComposer extends FilterComposer<_$CustomTablesDb, WithDefaults> { $WithDefaultsFilterComposer(super.$state); @@ -2182,7 +2154,7 @@ class $WithDefaultsOrderingComposer ColumnOrderings(column, joinBuilders: joinBuilders)); } -typedef $WithConstraintsInsertCompanionBuilder = WithConstraintsCompanion +typedef $WithConstraintsCreateCompanionBuilder = WithConstraintsCompanion Function({ Value a, required int b, @@ -2203,8 +2175,7 @@ class $WithConstraintsTableManager extends RootTableManager< WithConstraint, $WithConstraintsFilterComposer, $WithConstraintsOrderingComposer, - $WithConstraintsProcessedTableManager, - $WithConstraintsInsertCompanionBuilder, + $WithConstraintsCreateCompanionBuilder, $WithConstraintsUpdateCompanionBuilder> { $WithConstraintsTableManager(_$CustomTablesDb db, WithConstraints table) : super(TableManagerState( @@ -2214,9 +2185,7 @@ class $WithConstraintsTableManager extends RootTableManager< $WithConstraintsFilterComposer(ComposerState(db, table)), orderingComposer: $WithConstraintsOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => - $WithConstraintsProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value a = const Value.absent(), Value b = const Value.absent(), Value c = const Value.absent(), @@ -2228,7 +2197,7 @@ class $WithConstraintsTableManager extends RootTableManager< c: c, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value a = const Value.absent(), required int b, Value c = const Value.absent(), @@ -2243,18 +2212,6 @@ class $WithConstraintsTableManager extends RootTableManager< )); } -class $WithConstraintsProcessedTableManager extends ProcessedTableManager< - _$CustomTablesDb, - WithConstraints, - WithConstraint, - $WithConstraintsFilterComposer, - $WithConstraintsOrderingComposer, - $WithConstraintsProcessedTableManager, - $WithConstraintsInsertCompanionBuilder, - $WithConstraintsUpdateCompanionBuilder> { - $WithConstraintsProcessedTableManager(super.$state); -} - class $WithConstraintsFilterComposer extends FilterComposer<_$CustomTablesDb, WithConstraints> { $WithConstraintsFilterComposer(super.$state); @@ -2293,7 +2250,7 @@ class $WithConstraintsOrderingComposer ColumnOrderings(column, joinBuilders: joinBuilders)); } -typedef $ConfigTableInsertCompanionBuilder = ConfigCompanion Function({ +typedef $ConfigTableCreateCompanionBuilder = ConfigCompanion Function({ required String configKey, Value configValue, Value syncState, @@ -2314,8 +2271,7 @@ class $ConfigTableTableManager extends RootTableManager< Config, $ConfigTableFilterComposer, $ConfigTableOrderingComposer, - $ConfigTableProcessedTableManager, - $ConfigTableInsertCompanionBuilder, + $ConfigTableCreateCompanionBuilder, $ConfigTableUpdateCompanionBuilder> { $ConfigTableTableManager(_$CustomTablesDb db, ConfigTable table) : super(TableManagerState( @@ -2325,8 +2281,7 @@ class $ConfigTableTableManager extends RootTableManager< $ConfigTableFilterComposer(ComposerState(db, table)), orderingComposer: $ConfigTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => $ConfigTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value configKey = const Value.absent(), Value configValue = const Value.absent(), Value syncState = const Value.absent(), @@ -2340,7 +2295,7 @@ class $ConfigTableTableManager extends RootTableManager< syncStateImplicit: syncStateImplicit, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ required String configKey, Value configValue = const Value.absent(), Value syncState = const Value.absent(), @@ -2357,18 +2312,6 @@ class $ConfigTableTableManager extends RootTableManager< )); } -class $ConfigTableProcessedTableManager extends ProcessedTableManager< - _$CustomTablesDb, - ConfigTable, - Config, - $ConfigTableFilterComposer, - $ConfigTableOrderingComposer, - $ConfigTableProcessedTableManager, - $ConfigTableInsertCompanionBuilder, - $ConfigTableUpdateCompanionBuilder> { - $ConfigTableProcessedTableManager(super.$state); -} - class $ConfigTableFilterComposer extends FilterComposer<_$CustomTablesDb, ConfigTable> { $ConfigTableFilterComposer(super.$state); @@ -2421,7 +2364,7 @@ class $ConfigTableOrderingComposer ColumnOrderings(column, joinBuilders: joinBuilders)); } -typedef $MytableInsertCompanionBuilder = MytableCompanion Function({ +typedef $MytableCreateCompanionBuilder = MytableCompanion Function({ Value someid, Value sometext, Value isInserting, @@ -2440,8 +2383,7 @@ class $MytableTableManager extends RootTableManager< MytableData, $MytableFilterComposer, $MytableOrderingComposer, - $MytableProcessedTableManager, - $MytableInsertCompanionBuilder, + $MytableCreateCompanionBuilder, $MytableUpdateCompanionBuilder> { $MytableTableManager(_$CustomTablesDb db, Mytable table) : super(TableManagerState( @@ -2449,8 +2391,7 @@ class $MytableTableManager extends RootTableManager< table: table, filteringComposer: $MytableFilterComposer(ComposerState(db, table)), orderingComposer: $MytableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => $MytableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value someid = const Value.absent(), Value sometext = const Value.absent(), Value isInserting = const Value.absent(), @@ -2462,7 +2403,7 @@ class $MytableTableManager extends RootTableManager< isInserting: isInserting, somedate: somedate, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value someid = const Value.absent(), Value sometext = const Value.absent(), Value isInserting = const Value.absent(), @@ -2477,18 +2418,6 @@ class $MytableTableManager extends RootTableManager< )); } -class $MytableProcessedTableManager extends ProcessedTableManager< - _$CustomTablesDb, - Mytable, - MytableData, - $MytableFilterComposer, - $MytableOrderingComposer, - $MytableProcessedTableManager, - $MytableInsertCompanionBuilder, - $MytableUpdateCompanionBuilder> { - $MytableProcessedTableManager(super.$state); -} - class $MytableFilterComposer extends FilterComposer<_$CustomTablesDb, Mytable> { $MytableFilterComposer(super.$state); ColumnFilters get someid => $state.composableBuilder( @@ -2536,7 +2465,7 @@ class $MytableOrderingComposer ColumnOrderings(column, joinBuilders: joinBuilders)); } -typedef $EmailInsertCompanionBuilder = EmailCompanion Function({ +typedef $EmailCreateCompanionBuilder = EmailCompanion Function({ required String sender, required String title, required String body, @@ -2555,8 +2484,7 @@ class $EmailTableManager extends RootTableManager< EMail, $EmailFilterComposer, $EmailOrderingComposer, - $EmailProcessedTableManager, - $EmailInsertCompanionBuilder, + $EmailCreateCompanionBuilder, $EmailUpdateCompanionBuilder> { $EmailTableManager(_$CustomTablesDb db, Email table) : super(TableManagerState( @@ -2564,8 +2492,7 @@ class $EmailTableManager extends RootTableManager< table: table, filteringComposer: $EmailFilterComposer(ComposerState(db, table)), orderingComposer: $EmailOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => $EmailProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value sender = const Value.absent(), Value title = const Value.absent(), Value body = const Value.absent(), @@ -2577,7 +2504,7 @@ class $EmailTableManager extends RootTableManager< body: body, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ required String sender, required String title, required String body, @@ -2592,18 +2519,6 @@ class $EmailTableManager extends RootTableManager< )); } -class $EmailProcessedTableManager extends ProcessedTableManager< - _$CustomTablesDb, - Email, - EMail, - $EmailFilterComposer, - $EmailOrderingComposer, - $EmailProcessedTableManager, - $EmailInsertCompanionBuilder, - $EmailUpdateCompanionBuilder> { - $EmailProcessedTableManager(super.$state); -} - class $EmailFilterComposer extends FilterComposer<_$CustomTablesDb, Email> { $EmailFilterComposer(super.$state); ColumnFilters get sender => $state.composableBuilder( @@ -2640,7 +2555,7 @@ class $EmailOrderingComposer extends OrderingComposer<_$CustomTablesDb, Email> { ColumnOrderings(column, joinBuilders: joinBuilders)); } -typedef $WeirdTableInsertCompanionBuilder = WeirdTableCompanion Function({ +typedef $WeirdTableCreateCompanionBuilder = WeirdTableCompanion Function({ required int sqlClass, required String textColumn, Value rowid, @@ -2657,8 +2572,7 @@ class $WeirdTableTableManager extends RootTableManager< WeirdData, $WeirdTableFilterComposer, $WeirdTableOrderingComposer, - $WeirdTableProcessedTableManager, - $WeirdTableInsertCompanionBuilder, + $WeirdTableCreateCompanionBuilder, $WeirdTableUpdateCompanionBuilder> { $WeirdTableTableManager(_$CustomTablesDb db, WeirdTable table) : super(TableManagerState( @@ -2668,8 +2582,7 @@ class $WeirdTableTableManager extends RootTableManager< $WeirdTableFilterComposer(ComposerState(db, table)), orderingComposer: $WeirdTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => $WeirdTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value sqlClass = const Value.absent(), Value textColumn = const Value.absent(), Value rowid = const Value.absent(), @@ -2679,7 +2592,7 @@ class $WeirdTableTableManager extends RootTableManager< textColumn: textColumn, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ required int sqlClass, required String textColumn, Value rowid = const Value.absent(), @@ -2692,18 +2605,6 @@ class $WeirdTableTableManager extends RootTableManager< )); } -class $WeirdTableProcessedTableManager extends ProcessedTableManager< - _$CustomTablesDb, - WeirdTable, - WeirdData, - $WeirdTableFilterComposer, - $WeirdTableOrderingComposer, - $WeirdTableProcessedTableManager, - $WeirdTableInsertCompanionBuilder, - $WeirdTableUpdateCompanionBuilder> { - $WeirdTableProcessedTableManager(super.$state); -} - class $WeirdTableFilterComposer extends FilterComposer<_$CustomTablesDb, WeirdTable> { $WeirdTableFilterComposer(super.$state); diff --git a/drift/test/generated/todos.g.dart b/drift/test/generated/todos.g.dart index 22c05db2c..b9246c6d7 100644 --- a/drift/test/generated/todos.g.dart +++ b/drift/test/generated/todos.g.dart @@ -3433,7 +3433,7 @@ abstract class _$TodoDb extends GeneratedDatabase { ]; } -typedef $$CategoriesTableInsertCompanionBuilder = CategoriesCompanion Function({ +typedef $$CategoriesTableCreateCompanionBuilder = CategoriesCompanion Function({ Value id, required String description, Value priority, @@ -3450,8 +3450,7 @@ class $$CategoriesTableTableManager extends RootTableManager< Category, $$CategoriesTableFilterComposer, $$CategoriesTableOrderingComposer, - $$CategoriesTableProcessedTableManager, - $$CategoriesTableInsertCompanionBuilder, + $$CategoriesTableCreateCompanionBuilder, $$CategoriesTableUpdateCompanionBuilder> { $$CategoriesTableTableManager(_$TodoDb db, $CategoriesTable table) : super(TableManagerState( @@ -3461,9 +3460,7 @@ class $$CategoriesTableTableManager extends RootTableManager< $$CategoriesTableFilterComposer(ComposerState(db, table)), orderingComposer: $$CategoriesTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$CategoriesTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value id = const Value.absent(), Value description = const Value.absent(), Value priority = const Value.absent(), @@ -3473,7 +3470,7 @@ class $$CategoriesTableTableManager extends RootTableManager< description: description, priority: priority, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value id = const Value.absent(), required String description, Value priority = const Value.absent(), @@ -3486,18 +3483,6 @@ class $$CategoriesTableTableManager extends RootTableManager< )); } -class $$CategoriesTableProcessedTableManager extends ProcessedTableManager< - _$TodoDb, - $CategoriesTable, - Category, - $$CategoriesTableFilterComposer, - $$CategoriesTableOrderingComposer, - $$CategoriesTableProcessedTableManager, - $$CategoriesTableInsertCompanionBuilder, - $$CategoriesTableUpdateCompanionBuilder> { - $$CategoriesTableProcessedTableManager(super.$state); -} - class $$CategoriesTableFilterComposer extends FilterComposer<_$TodoDb, $CategoriesTable> { $$CategoriesTableFilterComposer(super.$state); @@ -3564,7 +3549,7 @@ class $$CategoriesTableOrderingComposer ColumnOrderings(column, joinBuilders: joinBuilders)); } -typedef $$TodosTableTableInsertCompanionBuilder = TodosTableCompanion Function({ +typedef $$TodosTableTableCreateCompanionBuilder = TodosTableCompanion Function({ Value id, Value title, required String content, @@ -3587,8 +3572,7 @@ class $$TodosTableTableTableManager extends RootTableManager< TodoEntry, $$TodosTableTableFilterComposer, $$TodosTableTableOrderingComposer, - $$TodosTableTableProcessedTableManager, - $$TodosTableTableInsertCompanionBuilder, + $$TodosTableTableCreateCompanionBuilder, $$TodosTableTableUpdateCompanionBuilder> { $$TodosTableTableTableManager(_$TodoDb db, $TodosTableTable table) : super(TableManagerState( @@ -3598,9 +3582,7 @@ class $$TodosTableTableTableManager extends RootTableManager< $$TodosTableTableFilterComposer(ComposerState(db, table)), orderingComposer: $$TodosTableTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$TodosTableTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value id = const Value.absent(), Value title = const Value.absent(), Value content = const Value.absent(), @@ -3616,7 +3598,7 @@ class $$TodosTableTableTableManager extends RootTableManager< category: category, status: status, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value id = const Value.absent(), Value title = const Value.absent(), required String content, @@ -3635,18 +3617,6 @@ class $$TodosTableTableTableManager extends RootTableManager< )); } -class $$TodosTableTableProcessedTableManager extends ProcessedTableManager< - _$TodoDb, - $TodosTableTable, - TodoEntry, - $$TodosTableTableFilterComposer, - $$TodosTableTableOrderingComposer, - $$TodosTableTableProcessedTableManager, - $$TodosTableTableInsertCompanionBuilder, - $$TodosTableTableUpdateCompanionBuilder> { - $$TodosTableTableProcessedTableManager(super.$state); -} - class $$TodosTableTableFilterComposer extends FilterComposer<_$TodoDb, $TodosTableTable> { $$TodosTableTableFilterComposer(super.$state); @@ -3733,7 +3703,7 @@ class $$TodosTableTableOrderingComposer } } -typedef $$UsersTableInsertCompanionBuilder = UsersCompanion Function({ +typedef $$UsersTableCreateCompanionBuilder = UsersCompanion Function({ Value id, required String name, Value isAwesome, @@ -3754,8 +3724,7 @@ class $$UsersTableTableManager extends RootTableManager< User, $$UsersTableFilterComposer, $$UsersTableOrderingComposer, - $$UsersTableProcessedTableManager, - $$UsersTableInsertCompanionBuilder, + $$UsersTableCreateCompanionBuilder, $$UsersTableUpdateCompanionBuilder> { $$UsersTableTableManager(_$TodoDb db, $UsersTable table) : super(TableManagerState( @@ -3765,8 +3734,7 @@ class $$UsersTableTableManager extends RootTableManager< $$UsersTableFilterComposer(ComposerState(db, table)), orderingComposer: $$UsersTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => $$UsersTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value id = const Value.absent(), Value name = const Value.absent(), Value isAwesome = const Value.absent(), @@ -3780,7 +3748,7 @@ class $$UsersTableTableManager extends RootTableManager< profilePicture: profilePicture, creationTime: creationTime, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value id = const Value.absent(), required String name, Value isAwesome = const Value.absent(), @@ -3797,18 +3765,6 @@ class $$UsersTableTableManager extends RootTableManager< )); } -class $$UsersTableProcessedTableManager extends ProcessedTableManager< - _$TodoDb, - $UsersTable, - User, - $$UsersTableFilterComposer, - $$UsersTableOrderingComposer, - $$UsersTableProcessedTableManager, - $$UsersTableInsertCompanionBuilder, - $$UsersTableUpdateCompanionBuilder> { - $$UsersTableProcessedTableManager(super.$state); -} - class $$UsersTableFilterComposer extends FilterComposer<_$TodoDb, $UsersTable> { $$UsersTableFilterComposer(super.$state); ColumnWithTypeConverterFilters get id => @@ -3868,7 +3824,7 @@ class $$UsersTableOrderingComposer ColumnOrderings(column, joinBuilders: joinBuilders)); } -typedef $$SharedTodosTableInsertCompanionBuilder = SharedTodosCompanion +typedef $$SharedTodosTableCreateCompanionBuilder = SharedTodosCompanion Function({ required int todo, required int user, @@ -3887,8 +3843,7 @@ class $$SharedTodosTableTableManager extends RootTableManager< SharedTodo, $$SharedTodosTableFilterComposer, $$SharedTodosTableOrderingComposer, - $$SharedTodosTableProcessedTableManager, - $$SharedTodosTableInsertCompanionBuilder, + $$SharedTodosTableCreateCompanionBuilder, $$SharedTodosTableUpdateCompanionBuilder> { $$SharedTodosTableTableManager(_$TodoDb db, $SharedTodosTable table) : super(TableManagerState( @@ -3898,9 +3853,7 @@ class $$SharedTodosTableTableManager extends RootTableManager< $$SharedTodosTableFilterComposer(ComposerState(db, table)), orderingComposer: $$SharedTodosTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$SharedTodosTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value todo = const Value.absent(), Value user = const Value.absent(), Value rowid = const Value.absent(), @@ -3910,7 +3863,7 @@ class $$SharedTodosTableTableManager extends RootTableManager< user: user, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ required int todo, required int user, Value rowid = const Value.absent(), @@ -3923,18 +3876,6 @@ class $$SharedTodosTableTableManager extends RootTableManager< )); } -class $$SharedTodosTableProcessedTableManager extends ProcessedTableManager< - _$TodoDb, - $SharedTodosTable, - SharedTodo, - $$SharedTodosTableFilterComposer, - $$SharedTodosTableOrderingComposer, - $$SharedTodosTableProcessedTableManager, - $$SharedTodosTableInsertCompanionBuilder, - $$SharedTodosTableUpdateCompanionBuilder> { - $$SharedTodosTableProcessedTableManager(super.$state); -} - class $$SharedTodosTableFilterComposer extends FilterComposer<_$TodoDb, $SharedTodosTable> { $$SharedTodosTableFilterComposer(super.$state); @@ -3963,7 +3904,7 @@ class $$SharedTodosTableOrderingComposer ColumnOrderings(column, joinBuilders: joinBuilders)); } -typedef $$TableWithoutPKTableInsertCompanionBuilder = TableWithoutPKCompanion +typedef $$TableWithoutPKTableCreateCompanionBuilder = TableWithoutPKCompanion Function({ required int notReallyAnId, required double someFloat, @@ -3986,8 +3927,7 @@ class $$TableWithoutPKTableTableManager extends RootTableManager< CustomRowClass, $$TableWithoutPKTableFilterComposer, $$TableWithoutPKTableOrderingComposer, - $$TableWithoutPKTableProcessedTableManager, - $$TableWithoutPKTableInsertCompanionBuilder, + $$TableWithoutPKTableCreateCompanionBuilder, $$TableWithoutPKTableUpdateCompanionBuilder> { $$TableWithoutPKTableTableManager(_$TodoDb db, $TableWithoutPKTable table) : super(TableManagerState( @@ -3997,9 +3937,7 @@ class $$TableWithoutPKTableTableManager extends RootTableManager< $$TableWithoutPKTableFilterComposer(ComposerState(db, table)), orderingComposer: $$TableWithoutPKTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$TableWithoutPKTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value notReallyAnId = const Value.absent(), Value someFloat = const Value.absent(), Value webSafeInt = const Value.absent(), @@ -4013,7 +3951,7 @@ class $$TableWithoutPKTableTableManager extends RootTableManager< custom: custom, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ required int notReallyAnId, required double someFloat, Value webSafeInt = const Value.absent(), @@ -4030,18 +3968,6 @@ class $$TableWithoutPKTableTableManager extends RootTableManager< )); } -class $$TableWithoutPKTableProcessedTableManager extends ProcessedTableManager< - _$TodoDb, - $TableWithoutPKTable, - CustomRowClass, - $$TableWithoutPKTableFilterComposer, - $$TableWithoutPKTableOrderingComposer, - $$TableWithoutPKTableProcessedTableManager, - $$TableWithoutPKTableInsertCompanionBuilder, - $$TableWithoutPKTableUpdateCompanionBuilder> { - $$TableWithoutPKTableProcessedTableManager(super.$state); -} - class $$TableWithoutPKTableFilterComposer extends FilterComposer<_$TodoDb, $TableWithoutPKTable> { $$TableWithoutPKTableFilterComposer(super.$state); @@ -4092,7 +4018,7 @@ class $$TableWithoutPKTableOrderingComposer ColumnOrderings(column, joinBuilders: joinBuilders)); } -typedef $$PureDefaultsTableInsertCompanionBuilder = PureDefaultsCompanion +typedef $$PureDefaultsTableCreateCompanionBuilder = PureDefaultsCompanion Function({ Value txt, Value rowid, @@ -4109,8 +4035,7 @@ class $$PureDefaultsTableTableManager extends RootTableManager< PureDefault, $$PureDefaultsTableFilterComposer, $$PureDefaultsTableOrderingComposer, - $$PureDefaultsTableProcessedTableManager, - $$PureDefaultsTableInsertCompanionBuilder, + $$PureDefaultsTableCreateCompanionBuilder, $$PureDefaultsTableUpdateCompanionBuilder> { $$PureDefaultsTableTableManager(_$TodoDb db, $PureDefaultsTable table) : super(TableManagerState( @@ -4120,9 +4045,7 @@ class $$PureDefaultsTableTableManager extends RootTableManager< $$PureDefaultsTableFilterComposer(ComposerState(db, table)), orderingComposer: $$PureDefaultsTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$PureDefaultsTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value txt = const Value.absent(), Value rowid = const Value.absent(), }) => @@ -4130,7 +4053,7 @@ class $$PureDefaultsTableTableManager extends RootTableManager< txt: txt, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value txt = const Value.absent(), Value rowid = const Value.absent(), }) => @@ -4141,18 +4064,6 @@ class $$PureDefaultsTableTableManager extends RootTableManager< )); } -class $$PureDefaultsTableProcessedTableManager extends ProcessedTableManager< - _$TodoDb, - $PureDefaultsTable, - PureDefault, - $$PureDefaultsTableFilterComposer, - $$PureDefaultsTableOrderingComposer, - $$PureDefaultsTableProcessedTableManager, - $$PureDefaultsTableInsertCompanionBuilder, - $$PureDefaultsTableUpdateCompanionBuilder> { - $$PureDefaultsTableProcessedTableManager(super.$state); -} - class $$PureDefaultsTableFilterComposer extends FilterComposer<_$TodoDb, $PureDefaultsTable> { $$PureDefaultsTableFilterComposer(super.$state); @@ -4173,7 +4084,7 @@ class $$PureDefaultsTableOrderingComposer ColumnOrderings(column, joinBuilders: joinBuilders)); } -typedef $$WithCustomTypeTableInsertCompanionBuilder = WithCustomTypeCompanion +typedef $$WithCustomTypeTableCreateCompanionBuilder = WithCustomTypeCompanion Function({ required UuidValue id, Value rowid, @@ -4190,8 +4101,7 @@ class $$WithCustomTypeTableTableManager extends RootTableManager< WithCustomTypeData, $$WithCustomTypeTableFilterComposer, $$WithCustomTypeTableOrderingComposer, - $$WithCustomTypeTableProcessedTableManager, - $$WithCustomTypeTableInsertCompanionBuilder, + $$WithCustomTypeTableCreateCompanionBuilder, $$WithCustomTypeTableUpdateCompanionBuilder> { $$WithCustomTypeTableTableManager(_$TodoDb db, $WithCustomTypeTable table) : super(TableManagerState( @@ -4201,9 +4111,7 @@ class $$WithCustomTypeTableTableManager extends RootTableManager< $$WithCustomTypeTableFilterComposer(ComposerState(db, table)), orderingComposer: $$WithCustomTypeTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$WithCustomTypeTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value id = const Value.absent(), Value rowid = const Value.absent(), }) => @@ -4211,7 +4119,7 @@ class $$WithCustomTypeTableTableManager extends RootTableManager< id: id, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ required UuidValue id, Value rowid = const Value.absent(), }) => @@ -4222,18 +4130,6 @@ class $$WithCustomTypeTableTableManager extends RootTableManager< )); } -class $$WithCustomTypeTableProcessedTableManager extends ProcessedTableManager< - _$TodoDb, - $WithCustomTypeTable, - WithCustomTypeData, - $$WithCustomTypeTableFilterComposer, - $$WithCustomTypeTableOrderingComposer, - $$WithCustomTypeTableProcessedTableManager, - $$WithCustomTypeTableInsertCompanionBuilder, - $$WithCustomTypeTableUpdateCompanionBuilder> { - $$WithCustomTypeTableProcessedTableManager(super.$state); -} - class $$WithCustomTypeTableFilterComposer extends FilterComposer<_$TodoDb, $WithCustomTypeTable> { $$WithCustomTypeTableFilterComposer(super.$state); @@ -4252,7 +4148,7 @@ class $$WithCustomTypeTableOrderingComposer ColumnOrderings(column, joinBuilders: joinBuilders)); } -typedef $$TableWithEveryColumnTypeTableInsertCompanionBuilder +typedef $$TableWithEveryColumnTypeTableCreateCompanionBuilder = TableWithEveryColumnTypeCompanion Function({ Value id, Value aBool, @@ -4285,8 +4181,7 @@ class $$TableWithEveryColumnTypeTableTableManager extends RootTableManager< TableWithEveryColumnTypeData, $$TableWithEveryColumnTypeTableFilterComposer, $$TableWithEveryColumnTypeTableOrderingComposer, - $$TableWithEveryColumnTypeTableProcessedTableManager, - $$TableWithEveryColumnTypeTableInsertCompanionBuilder, + $$TableWithEveryColumnTypeTableCreateCompanionBuilder, $$TableWithEveryColumnTypeTableUpdateCompanionBuilder> { $$TableWithEveryColumnTypeTableTableManager( _$TodoDb db, $TableWithEveryColumnTypeTable table) @@ -4297,9 +4192,7 @@ class $$TableWithEveryColumnTypeTableTableManager extends RootTableManager< ComposerState(db, table)), orderingComposer: $$TableWithEveryColumnTypeTableOrderingComposer( ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$TableWithEveryColumnTypeTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value id = const Value.absent(), Value aBool = const Value.absent(), Value aDateTime = const Value.absent(), @@ -4323,7 +4216,7 @@ class $$TableWithEveryColumnTypeTableTableManager extends RootTableManager< anIntEnum: anIntEnum, aTextWithConverter: aTextWithConverter, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value id = const Value.absent(), Value aBool = const Value.absent(), Value aDateTime = const Value.absent(), @@ -4350,19 +4243,6 @@ class $$TableWithEveryColumnTypeTableTableManager extends RootTableManager< )); } -class $$TableWithEveryColumnTypeTableProcessedTableManager - extends ProcessedTableManager< - _$TodoDb, - $TableWithEveryColumnTypeTable, - TableWithEveryColumnTypeData, - $$TableWithEveryColumnTypeTableFilterComposer, - $$TableWithEveryColumnTypeTableOrderingComposer, - $$TableWithEveryColumnTypeTableProcessedTableManager, - $$TableWithEveryColumnTypeTableInsertCompanionBuilder, - $$TableWithEveryColumnTypeTableUpdateCompanionBuilder> { - $$TableWithEveryColumnTypeTableProcessedTableManager(super.$state); -} - class $$TableWithEveryColumnTypeTableFilterComposer extends FilterComposer<_$TodoDb, $TableWithEveryColumnTypeTable> { $$TableWithEveryColumnTypeTableFilterComposer(super.$state); @@ -4477,7 +4357,7 @@ class $$TableWithEveryColumnTypeTableOrderingComposer ColumnOrderings(column, joinBuilders: joinBuilders)); } -typedef $$DepartmentTableInsertCompanionBuilder = DepartmentCompanion Function({ +typedef $$DepartmentTableCreateCompanionBuilder = DepartmentCompanion Function({ Value id, Value name, }); @@ -4492,8 +4372,7 @@ class $$DepartmentTableTableManager extends RootTableManager< DepartmentData, $$DepartmentTableFilterComposer, $$DepartmentTableOrderingComposer, - $$DepartmentTableProcessedTableManager, - $$DepartmentTableInsertCompanionBuilder, + $$DepartmentTableCreateCompanionBuilder, $$DepartmentTableUpdateCompanionBuilder> { $$DepartmentTableTableManager(_$TodoDb db, $DepartmentTable table) : super(TableManagerState( @@ -4503,9 +4382,7 @@ class $$DepartmentTableTableManager extends RootTableManager< $$DepartmentTableFilterComposer(ComposerState(db, table)), orderingComposer: $$DepartmentTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$DepartmentTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value id = const Value.absent(), Value name = const Value.absent(), }) => @@ -4513,7 +4390,7 @@ class $$DepartmentTableTableManager extends RootTableManager< id: id, name: name, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value id = const Value.absent(), Value name = const Value.absent(), }) => @@ -4524,18 +4401,6 @@ class $$DepartmentTableTableManager extends RootTableManager< )); } -class $$DepartmentTableProcessedTableManager extends ProcessedTableManager< - _$TodoDb, - $DepartmentTable, - DepartmentData, - $$DepartmentTableFilterComposer, - $$DepartmentTableOrderingComposer, - $$DepartmentTableProcessedTableManager, - $$DepartmentTableInsertCompanionBuilder, - $$DepartmentTableUpdateCompanionBuilder> { - $$DepartmentTableProcessedTableManager(super.$state); -} - class $$DepartmentTableFilterComposer extends FilterComposer<_$TodoDb, $DepartmentTable> { $$DepartmentTableFilterComposer(super.$state); @@ -4577,7 +4442,7 @@ class $$DepartmentTableOrderingComposer ColumnOrderings(column, joinBuilders: joinBuilders)); } -typedef $$ProductTableInsertCompanionBuilder = ProductCompanion Function({ +typedef $$ProductTableCreateCompanionBuilder = ProductCompanion Function({ Value id, Value name, Value department, @@ -4594,8 +4459,7 @@ class $$ProductTableTableManager extends RootTableManager< ProductData, $$ProductTableFilterComposer, $$ProductTableOrderingComposer, - $$ProductTableProcessedTableManager, - $$ProductTableInsertCompanionBuilder, + $$ProductTableCreateCompanionBuilder, $$ProductTableUpdateCompanionBuilder> { $$ProductTableTableManager(_$TodoDb db, $ProductTable table) : super(TableManagerState( @@ -4605,8 +4469,7 @@ class $$ProductTableTableManager extends RootTableManager< $$ProductTableFilterComposer(ComposerState(db, table)), orderingComposer: $$ProductTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => $$ProductTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value id = const Value.absent(), Value name = const Value.absent(), Value department = const Value.absent(), @@ -4616,7 +4479,7 @@ class $$ProductTableTableManager extends RootTableManager< name: name, department: department, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value id = const Value.absent(), Value name = const Value.absent(), Value department = const Value.absent(), @@ -4629,18 +4492,6 @@ class $$ProductTableTableManager extends RootTableManager< )); } -class $$ProductTableProcessedTableManager extends ProcessedTableManager< - _$TodoDb, - $ProductTable, - ProductData, - $$ProductTableFilterComposer, - $$ProductTableOrderingComposer, - $$ProductTableProcessedTableManager, - $$ProductTableInsertCompanionBuilder, - $$ProductTableUpdateCompanionBuilder> { - $$ProductTableProcessedTableManager(super.$state); -} - class $$ProductTableFilterComposer extends FilterComposer<_$TodoDb, $ProductTable> { $$ProductTableFilterComposer(super.$state); @@ -4706,7 +4557,7 @@ class $$ProductTableOrderingComposer } } -typedef $$StoreTableInsertCompanionBuilder = StoreCompanion Function({ +typedef $$StoreTableCreateCompanionBuilder = StoreCompanion Function({ Value id, Value name, }); @@ -4721,8 +4572,7 @@ class $$StoreTableTableManager extends RootTableManager< StoreData, $$StoreTableFilterComposer, $$StoreTableOrderingComposer, - $$StoreTableProcessedTableManager, - $$StoreTableInsertCompanionBuilder, + $$StoreTableCreateCompanionBuilder, $$StoreTableUpdateCompanionBuilder> { $$StoreTableTableManager(_$TodoDb db, $StoreTable table) : super(TableManagerState( @@ -4732,8 +4582,7 @@ class $$StoreTableTableManager extends RootTableManager< $$StoreTableFilterComposer(ComposerState(db, table)), orderingComposer: $$StoreTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => $$StoreTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value id = const Value.absent(), Value name = const Value.absent(), }) => @@ -4741,7 +4590,7 @@ class $$StoreTableTableManager extends RootTableManager< id: id, name: name, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value id = const Value.absent(), Value name = const Value.absent(), }) => @@ -4752,18 +4601,6 @@ class $$StoreTableTableManager extends RootTableManager< )); } -class $$StoreTableProcessedTableManager extends ProcessedTableManager< - _$TodoDb, - $StoreTable, - StoreData, - $$StoreTableFilterComposer, - $$StoreTableOrderingComposer, - $$StoreTableProcessedTableManager, - $$StoreTableInsertCompanionBuilder, - $$StoreTableUpdateCompanionBuilder> { - $$StoreTableProcessedTableManager(super.$state); -} - class $$StoreTableFilterComposer extends FilterComposer<_$TodoDb, $StoreTable> { $$StoreTableFilterComposer(super.$state); ColumnFilters get id => $state.composableBuilder( @@ -4804,7 +4641,7 @@ class $$StoreTableOrderingComposer ColumnOrderings(column, joinBuilders: joinBuilders)); } -typedef $$ListingTableInsertCompanionBuilder = ListingCompanion Function({ +typedef $$ListingTableCreateCompanionBuilder = ListingCompanion Function({ Value id, Value product, Value store, @@ -4823,8 +4660,7 @@ class $$ListingTableTableManager extends RootTableManager< ListingData, $$ListingTableFilterComposer, $$ListingTableOrderingComposer, - $$ListingTableProcessedTableManager, - $$ListingTableInsertCompanionBuilder, + $$ListingTableCreateCompanionBuilder, $$ListingTableUpdateCompanionBuilder> { $$ListingTableTableManager(_$TodoDb db, $ListingTable table) : super(TableManagerState( @@ -4834,8 +4670,7 @@ class $$ListingTableTableManager extends RootTableManager< $$ListingTableFilterComposer(ComposerState(db, table)), orderingComposer: $$ListingTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => $$ListingTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value id = const Value.absent(), Value product = const Value.absent(), Value store = const Value.absent(), @@ -4847,7 +4682,7 @@ class $$ListingTableTableManager extends RootTableManager< store: store, price: price, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value id = const Value.absent(), Value product = const Value.absent(), Value store = const Value.absent(), @@ -4862,18 +4697,6 @@ class $$ListingTableTableManager extends RootTableManager< )); } -class $$ListingTableProcessedTableManager extends ProcessedTableManager< - _$TodoDb, - $ListingTable, - ListingData, - $$ListingTableFilterComposer, - $$ListingTableOrderingComposer, - $$ListingTableProcessedTableManager, - $$ListingTableInsertCompanionBuilder, - $$ListingTableUpdateCompanionBuilder> { - $$ListingTableProcessedTableManager(super.$state); -} - class $$ListingTableFilterComposer extends FilterComposer<_$TodoDb, $ListingTable> { $$ListingTableFilterComposer(super.$state); diff --git a/drift/test/integration_tests/regress_2166_test.g.dart b/drift/test/integration_tests/regress_2166_test.g.dart index 3202268ce..949a7a7a1 100644 --- a/drift/test/integration_tests/regress_2166_test.g.dart +++ b/drift/test/integration_tests/regress_2166_test.g.dart @@ -200,7 +200,7 @@ abstract class _$_SomeDb extends GeneratedDatabase { List get allSchemaEntities => [someTable]; } -typedef $$_SomeTableTableInsertCompanionBuilder = _SomeTableCompanion Function({ +typedef $$_SomeTableTableCreateCompanionBuilder = _SomeTableCompanion Function({ Value id, Value name, }); @@ -215,8 +215,7 @@ class $$_SomeTableTableTableManager extends RootTableManager< _SomeTableData, $$_SomeTableTableFilterComposer, $$_SomeTableTableOrderingComposer, - $$_SomeTableTableProcessedTableManager, - $$_SomeTableTableInsertCompanionBuilder, + $$_SomeTableTableCreateCompanionBuilder, $$_SomeTableTableUpdateCompanionBuilder> { $$_SomeTableTableTableManager(_$_SomeDb db, $_SomeTableTable table) : super(TableManagerState( @@ -226,9 +225,7 @@ class $$_SomeTableTableTableManager extends RootTableManager< $$_SomeTableTableFilterComposer(ComposerState(db, table)), orderingComposer: $$_SomeTableTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$_SomeTableTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value id = const Value.absent(), Value name = const Value.absent(), }) => @@ -236,7 +233,7 @@ class $$_SomeTableTableTableManager extends RootTableManager< id: id, name: name, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value id = const Value.absent(), Value name = const Value.absent(), }) => @@ -247,18 +244,6 @@ class $$_SomeTableTableTableManager extends RootTableManager< )); } -class $$_SomeTableTableProcessedTableManager extends ProcessedTableManager< - _$_SomeDb, - $_SomeTableTable, - _SomeTableData, - $$_SomeTableTableFilterComposer, - $$_SomeTableTableOrderingComposer, - $$_SomeTableTableProcessedTableManager, - $$_SomeTableTableInsertCompanionBuilder, - $$_SomeTableTableUpdateCompanionBuilder> { - $$_SomeTableTableProcessedTableManager(super.$state); -} - class $$_SomeTableTableFilterComposer extends FilterComposer<_$_SomeDb, $_SomeTableTable> { $$_SomeTableTableFilterComposer(super.$state); diff --git a/drift/test/manager/manager_filter_test.dart b/drift/test/manager/manager_filter_test.dart index 95f62469a..3e67953b5 100644 --- a/drift/test/manager/manager_filter_test.dart +++ b/drift/test/manager/manager_filter_test.dart @@ -383,4 +383,29 @@ void main() { .count(), completion(1)); }); + + test('manager - multiple filters', () async { + await db.managers.tableWithEveryColumnType.create((o) => o( + aText: Value("person"), + anIntEnum: Value(TodoStatus.open), + aReal: Value(5.0), + aDateTime: Value(DateTime.now().add(Duration(days: 1))))); + await db.managers.tableWithEveryColumnType.create((o) => o( + aText: Value("person"), + anIntEnum: Value(TodoStatus.open), + aDateTime: Value(DateTime.now().add(Duration(days: 2))))); + await db.managers.tableWithEveryColumnType.create((o) => o( + aText: Value("drink"), + anIntEnum: Value(TodoStatus.open), + aReal: Value(3.0), + aDateTime: Value(DateTime.now().add(Duration(days: 3))))); + + // By default, all filters are AND + expect( + db.managers.tableWithEveryColumnType + .filter((f) => f.aText("person")) + .filter((f) => f.aReal(5.0)) + .count(), + completion(1)); + }); } diff --git a/drift_dev/lib/src/generated/analysis/results/column.g.dart b/drift_dev/lib/src/generated/analysis/results/column.g.dart index 5afc029ae..d63b16956 100644 --- a/drift_dev/lib/src/generated/analysis/results/column.g.dart +++ b/drift_dev/lib/src/generated/analysis/results/column.g.dart @@ -38,8 +38,8 @@ Map _$DartCheckExpressionToJson( }; LimitingTextLength _$LimitingTextLengthFromJson(Map json) => LimitingTextLength( - minLength: json['min_length'] as int?, - maxLength: json['max_length'] as int?, + minLength: (json['min_length'] as num?)?.toInt(), + maxLength: (json['max_length'] as num?)?.toInt(), ); Map _$LimitingTextLengthToJson(LimitingTextLength instance) => diff --git a/drift_dev/lib/src/generated/analysis/results/element.g.dart b/drift_dev/lib/src/generated/analysis/results/element.g.dart index 50a20aac5..736058bc7 100644 --- a/drift_dev/lib/src/generated/analysis/results/element.g.dart +++ b/drift_dev/lib/src/generated/analysis/results/element.g.dart @@ -19,7 +19,7 @@ Map _$DriftElementIdToJson(DriftElementId instance) => DriftDeclaration _$DriftDeclarationFromJson(Map json) => DriftDeclaration( Uri.parse(json['source_uri'] as String), - json['offset'] as int, + (json['offset'] as num).toInt(), json['name'] as String?, ); diff --git a/drift_dev/lib/src/writer/manager/manager_templates.dart b/drift_dev/lib/src/writer/manager/manager_templates.dart index 1af726775..bb975c5c8 100644 --- a/drift_dev/lib/src/writer/manager/manager_templates.dart +++ b/drift_dev/lib/src/writer/manager/manager_templates.dart @@ -54,16 +54,6 @@ class _ManagerCodeTemplates { .dartCode(leaf.generatedElement(table, rootTableManagerName(table))); } - /// Returns the name of the processed table manager class for a table - /// - /// This does not contain any prefixes, as this will always be generated in the same file - /// as the table manager and is not used outside of the file - /// - /// E.g. `$UserTableProcessedTableManager` - String processedTableManagerName(DriftTable table) { - return '\$${table.entityInfoName}ProcessedTableManager'; - } - /// Class which represents a table in the database /// Contains the prefix if the generation is modular /// E.g. `i0.UserTable` @@ -100,11 +90,11 @@ class _ManagerCodeTemplates { return '\$${table.entityInfoName}OrderingComposer'; } - /// Name of the typedef for the insert companion builder for a table + /// Name of the typedef for the create companion builder for a table /// /// This is the name of the typedef of a function that creates new rows in the table - String insertCompanionBuilderTypeDef(DriftTable table) { - return '\$${table.entityInfoName}InsertCompanionBuilder'; + String createCompanionBuilderTypeDef(DriftTable table) { + return '\$${table.entityInfoName}CreateCompanionBuilder'; } /// Name of the typedef for the update companion builder for a table @@ -115,16 +105,16 @@ class _ManagerCodeTemplates { } /// Build the builder for a companion class - /// This is used to build the insert and update companions + /// This is used to build the create and update companions /// Returns a tuple with the typedef and the builder - /// Use [isUpdate] to determine if the builder is for an update or insert companion + /// Use [isUpdate] to determine if the builder is for an update or create companion ({String typeDefinition, String companionBuilder}) companionBuilder( DriftTable table, TextEmitter leaf, {required bool isUpdate}) { // Get the name of the typedef final typedefName = isUpdate ? updateCompanionBuilderTypeDefName(table) - : insertCompanionBuilderTypeDef(table); + : createCompanionBuilderTypeDef(table); // Get the companion class name final companionClassName = leaf.dartCode(leaf.companionType(table)); @@ -156,7 +146,7 @@ class _ManagerCodeTemplates { companionBuilderArguments .write('$value<$typeName> $param = const $value.absent(),'); } else { - // Otherwise, for insert companions, required fields are required + // Otherwise, for create companions, required fields are required // and optional fields are defaulted to absent if (!column.isImplicitRowId && table.isColumnRequiredForInsert(column)) { @@ -188,8 +178,7 @@ class _ManagerCodeTemplates { ${rowClassWithPrefix(table, leaf)}, ${filterComposerNameWithPrefix(table, leaf)}, ${orderingComposerNameWithPrefix(table, leaf)}, - ${processedTableManagerName(table)}, - ${insertCompanionBuilderTypeDef(table)}, + ${createCompanionBuilderTypeDef(table)}, ${updateCompanionBuilderTypeDefName(table)}>"""; } @@ -212,7 +201,7 @@ class _ManagerCodeTemplates { required String dbClassName, required TextEmitter leaf, required String updateCompanionBuilder, - required String insertCompanionBuilder, + required String createCompanionBuilder, }) { return """class ${rootTableManagerName(table)} extends ${leaf.drift("RootTableManager")}${_tableManagerTypeArguments(table, dbClassName, leaf)} { ${rootTableManagerName(table)}(${databaseType(leaf, dbClassName)} db, ${tableClassWithPrefix(table, leaf)} table) : super( @@ -221,25 +210,12 @@ class _ManagerCodeTemplates { table: table, filteringComposer: ${filterComposerNameWithPrefix(table, leaf)}(${leaf.drift("ComposerState")}(db, table)), orderingComposer: ${orderingComposerNameWithPrefix(table, leaf)}(${leaf.drift("ComposerState")}(db, table)), - getChildManagerBuilder: (p) => ${processedTableManagerName(table)}(p), - getUpdateCompanionBuilder: $updateCompanionBuilder, - getInsertCompanionBuilder:$insertCompanionBuilder,)); + updateCompanionCallback: $updateCompanionBuilder, + createCompanionCallback: $createCompanionBuilder,)); } """; } - /// Returns code for the processed table manager class - String processedTableManager({ - required DriftTable table, - required String dbClassName, - required TextEmitter leaf, - }) { - return """class ${processedTableManagerName(table)} extends ${leaf.drift("ProcessedTableManager")}${_tableManagerTypeArguments(table, dbClassName, leaf)} { - ${processedTableManagerName(table)}(super.\$state); - } - """; - } - /// Returns the code for a tables filter composer String filterComposer({ required DriftTable table, diff --git a/drift_dev/lib/src/writer/manager/table_manager_writer.dart b/drift_dev/lib/src/writer/manager/table_manager_writer.dart index 3005c40cd..4fed3eaf0 100644 --- a/drift_dev/lib/src/writer/manager/table_manager_writer.dart +++ b/drift_dev/lib/src/writer/manager/table_manager_writer.dart @@ -45,9 +45,7 @@ class _TableManagerWriter { dbClassName: dbClassName, leaf: leaf, updateCompanionBuilder: updateCompanionBuilder, - insertCompanionBuilder: insertCompanionBuilder)); - leaf.write(_templates.processedTableManager( - table: table, dbClassName: dbClassName, leaf: leaf)); + createCompanionBuilder: insertCompanionBuilder)); // Gather the relationships to and from this table List<_Relation> relations = diff --git a/examples/app/lib/database/database.g.dart b/examples/app/lib/database/database.g.dart index b74ccb34b..e0c3ff17c 100644 --- a/examples/app/lib/database/database.g.dart +++ b/examples/app/lib/database/database.g.dart @@ -127,6 +127,14 @@ class Category extends DataClass implements Insertable { name: name ?? this.name, color: color ?? this.color, ); + Category copyWithCompanion(CategoriesCompanion data) { + return Category( + id: data.id.present ? data.id.value : this.id, + name: data.name.present ? data.name.value : this.name, + color: data.color.present ? data.color.value : this.color, + ); + } + @override String toString() { return (StringBuffer('Category(') @@ -373,6 +381,16 @@ class TodoEntry extends DataClass implements Insertable { category: category.present ? category.value : this.category, dueDate: dueDate.present ? dueDate.value : this.dueDate, ); + TodoEntry copyWithCompanion(TodoEntriesCompanion data) { + return TodoEntry( + id: data.id.present ? data.id.value : this.id, + description: + data.description.present ? data.description.value : this.description, + category: data.category.present ? data.category.value : this.category, + dueDate: data.dueDate.present ? data.dueDate.value : this.dueDate, + ); + } + @override String toString() { return (StringBuffer('TodoEntry(') @@ -565,6 +583,13 @@ class TextEntry extends DataClass implements Insertable { TextEntry copyWith({String? description}) => TextEntry( description: description ?? this.description, ); + TextEntry copyWithCompanion(TextEntriesCompanion data) { + return TextEntry( + description: + data.description.present ? data.description.value : this.description, + ); + } + @override String toString() { return (StringBuffer('TextEntry(') @@ -719,7 +744,7 @@ abstract class _$AppDatabase extends GeneratedDatabase { ); } -typedef $$CategoriesTableInsertCompanionBuilder = CategoriesCompanion Function({ +typedef $$CategoriesTableCreateCompanionBuilder = CategoriesCompanion Function({ Value id, required String name, required Color color, @@ -736,8 +761,7 @@ class $$CategoriesTableTableManager extends RootTableManager< Category, $$CategoriesTableFilterComposer, $$CategoriesTableOrderingComposer, - $$CategoriesTableProcessedTableManager, - $$CategoriesTableInsertCompanionBuilder, + $$CategoriesTableCreateCompanionBuilder, $$CategoriesTableUpdateCompanionBuilder> { $$CategoriesTableTableManager(_$AppDatabase db, $CategoriesTable table) : super(TableManagerState( @@ -747,9 +771,7 @@ class $$CategoriesTableTableManager extends RootTableManager< $$CategoriesTableFilterComposer(ComposerState(db, table)), orderingComposer: $$CategoriesTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$CategoriesTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value id = const Value.absent(), Value name = const Value.absent(), Value color = const Value.absent(), @@ -759,7 +781,7 @@ class $$CategoriesTableTableManager extends RootTableManager< name: name, color: color, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value id = const Value.absent(), required String name, required Color color, @@ -772,18 +794,6 @@ class $$CategoriesTableTableManager extends RootTableManager< )); } -class $$CategoriesTableProcessedTableManager extends ProcessedTableManager< - _$AppDatabase, - $CategoriesTable, - Category, - $$CategoriesTableFilterComposer, - $$CategoriesTableOrderingComposer, - $$CategoriesTableProcessedTableManager, - $$CategoriesTableInsertCompanionBuilder, - $$CategoriesTableUpdateCompanionBuilder> { - $$CategoriesTableProcessedTableManager(super.$state); -} - class $$CategoriesTableFilterComposer extends FilterComposer<_$AppDatabase, $CategoriesTable> { $$CategoriesTableFilterComposer(super.$state); @@ -837,7 +847,7 @@ class $$CategoriesTableOrderingComposer ColumnOrderings(column, joinBuilders: joinBuilders)); } -typedef $$TodoEntriesTableInsertCompanionBuilder = TodoEntriesCompanion +typedef $$TodoEntriesTableCreateCompanionBuilder = TodoEntriesCompanion Function({ Value id, required String description, @@ -858,8 +868,7 @@ class $$TodoEntriesTableTableManager extends RootTableManager< TodoEntry, $$TodoEntriesTableFilterComposer, $$TodoEntriesTableOrderingComposer, - $$TodoEntriesTableProcessedTableManager, - $$TodoEntriesTableInsertCompanionBuilder, + $$TodoEntriesTableCreateCompanionBuilder, $$TodoEntriesTableUpdateCompanionBuilder> { $$TodoEntriesTableTableManager(_$AppDatabase db, $TodoEntriesTable table) : super(TableManagerState( @@ -869,9 +878,7 @@ class $$TodoEntriesTableTableManager extends RootTableManager< $$TodoEntriesTableFilterComposer(ComposerState(db, table)), orderingComposer: $$TodoEntriesTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$TodoEntriesTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value id = const Value.absent(), Value description = const Value.absent(), Value category = const Value.absent(), @@ -883,7 +890,7 @@ class $$TodoEntriesTableTableManager extends RootTableManager< category: category, dueDate: dueDate, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value id = const Value.absent(), required String description, Value category = const Value.absent(), @@ -898,18 +905,6 @@ class $$TodoEntriesTableTableManager extends RootTableManager< )); } -class $$TodoEntriesTableProcessedTableManager extends ProcessedTableManager< - _$AppDatabase, - $TodoEntriesTable, - TodoEntry, - $$TodoEntriesTableFilterComposer, - $$TodoEntriesTableOrderingComposer, - $$TodoEntriesTableProcessedTableManager, - $$TodoEntriesTableInsertCompanionBuilder, - $$TodoEntriesTableUpdateCompanionBuilder> { - $$TodoEntriesTableProcessedTableManager(super.$state); -} - class $$TodoEntriesTableFilterComposer extends FilterComposer<_$AppDatabase, $TodoEntriesTable> { $$TodoEntriesTableFilterComposer(super.$state); @@ -972,7 +967,7 @@ class $$TodoEntriesTableOrderingComposer } } -typedef $TextEntriesInsertCompanionBuilder = TextEntriesCompanion Function({ +typedef $TextEntriesCreateCompanionBuilder = TextEntriesCompanion Function({ required String description, Value rowid, }); @@ -987,8 +982,7 @@ class $TextEntriesTableManager extends RootTableManager< TextEntry, $TextEntriesFilterComposer, $TextEntriesOrderingComposer, - $TextEntriesProcessedTableManager, - $TextEntriesInsertCompanionBuilder, + $TextEntriesCreateCompanionBuilder, $TextEntriesUpdateCompanionBuilder> { $TextEntriesTableManager(_$AppDatabase db, TextEntries table) : super(TableManagerState( @@ -998,8 +992,7 @@ class $TextEntriesTableManager extends RootTableManager< $TextEntriesFilterComposer(ComposerState(db, table)), orderingComposer: $TextEntriesOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => $TextEntriesProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value description = const Value.absent(), Value rowid = const Value.absent(), }) => @@ -1007,7 +1000,7 @@ class $TextEntriesTableManager extends RootTableManager< description: description, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ required String description, Value rowid = const Value.absent(), }) => @@ -1018,18 +1011,6 @@ class $TextEntriesTableManager extends RootTableManager< )); } -class $TextEntriesProcessedTableManager extends ProcessedTableManager< - _$AppDatabase, - TextEntries, - TextEntry, - $TextEntriesFilterComposer, - $TextEntriesOrderingComposer, - $TextEntriesProcessedTableManager, - $TextEntriesInsertCompanionBuilder, - $TextEntriesUpdateCompanionBuilder> { - $TextEntriesProcessedTableManager(super.$state); -} - class $TextEntriesFilterComposer extends FilterComposer<_$AppDatabase, TextEntries> { $TextEntriesFilterComposer(super.$state); diff --git a/examples/encryption/lib/database.g.dart b/examples/encryption/lib/database.g.dart index 045aa8c79..f6e394d18 100644 --- a/examples/encryption/lib/database.g.dart +++ b/examples/encryption/lib/database.g.dart @@ -191,7 +191,7 @@ abstract class _$MyEncryptedDatabase extends GeneratedDatabase { List get allSchemaEntities => [notes]; } -typedef $$NotesTableInsertCompanionBuilder = NotesCompanion Function({ +typedef $$NotesTableCreateCompanionBuilder = NotesCompanion Function({ Value id, required String content, }); @@ -206,8 +206,7 @@ class $$NotesTableTableManager extends RootTableManager< Note, $$NotesTableFilterComposer, $$NotesTableOrderingComposer, - $$NotesTableProcessedTableManager, - $$NotesTableInsertCompanionBuilder, + $$NotesTableCreateCompanionBuilder, $$NotesTableUpdateCompanionBuilder> { $$NotesTableTableManager(_$MyEncryptedDatabase db, $NotesTable table) : super(TableManagerState( @@ -217,8 +216,7 @@ class $$NotesTableTableManager extends RootTableManager< $$NotesTableFilterComposer(ComposerState(db, table)), orderingComposer: $$NotesTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => $$NotesTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value id = const Value.absent(), Value content = const Value.absent(), }) => @@ -226,7 +224,7 @@ class $$NotesTableTableManager extends RootTableManager< id: id, content: content, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value id = const Value.absent(), required String content, }) => @@ -237,18 +235,6 @@ class $$NotesTableTableManager extends RootTableManager< )); } -class $$NotesTableProcessedTableManager extends ProcessedTableManager< - _$MyEncryptedDatabase, - $NotesTable, - Note, - $$NotesTableFilterComposer, - $$NotesTableOrderingComposer, - $$NotesTableProcessedTableManager, - $$NotesTableInsertCompanionBuilder, - $$NotesTableUpdateCompanionBuilder> { - $$NotesTableProcessedTableManager(super.$state); -} - class $$NotesTableFilterComposer extends FilterComposer<_$MyEncryptedDatabase, $NotesTable> { $$NotesTableFilterComposer(super.$state); diff --git a/examples/flutter_web_worker_example/lib/src/database/database.g.dart b/examples/flutter_web_worker_example/lib/src/database/database.g.dart index db72fd978..b027df00e 100644 --- a/examples/flutter_web_worker_example/lib/src/database/database.g.dart +++ b/examples/flutter_web_worker_example/lib/src/database/database.g.dart @@ -214,7 +214,7 @@ abstract class _$MyDatabase extends GeneratedDatabase { List get allSchemaEntities => [entries]; } -typedef $EntriesInsertCompanionBuilder = EntriesCompanion Function({ +typedef $EntriesCreateCompanionBuilder = EntriesCompanion Function({ Value id, required String value, }); @@ -229,8 +229,7 @@ class $EntriesTableManager extends RootTableManager< Entry, $EntriesFilterComposer, $EntriesOrderingComposer, - $EntriesProcessedTableManager, - $EntriesInsertCompanionBuilder, + $EntriesCreateCompanionBuilder, $EntriesUpdateCompanionBuilder> { $EntriesTableManager(_$MyDatabase db, Entries table) : super(TableManagerState( @@ -238,8 +237,7 @@ class $EntriesTableManager extends RootTableManager< table: table, filteringComposer: $EntriesFilterComposer(ComposerState(db, table)), orderingComposer: $EntriesOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => $EntriesProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value id = const Value.absent(), Value value = const Value.absent(), }) => @@ -247,7 +245,7 @@ class $EntriesTableManager extends RootTableManager< id: id, value: value, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value id = const Value.absent(), required String value, }) => @@ -258,18 +256,6 @@ class $EntriesTableManager extends RootTableManager< )); } -class $EntriesProcessedTableManager extends ProcessedTableManager< - _$MyDatabase, - Entries, - Entry, - $EntriesFilterComposer, - $EntriesOrderingComposer, - $EntriesProcessedTableManager, - $EntriesInsertCompanionBuilder, - $EntriesUpdateCompanionBuilder> { - $EntriesProcessedTableManager(super.$state); -} - class $EntriesFilterComposer extends FilterComposer<_$MyDatabase, Entries> { $EntriesFilterComposer(super.$state); ColumnFilters get id => $state.composableBuilder( diff --git a/examples/migrations_example/lib/database.g.dart b/examples/migrations_example/lib/database.g.dart index 0e231e9ea..ae8e1dd48 100644 --- a/examples/migrations_example/lib/database.g.dart +++ b/examples/migrations_example/lib/database.g.dart @@ -162,6 +162,15 @@ class User extends DataClass implements Insertable { birthday: birthday.present ? birthday.value : this.birthday, nextUser: nextUser.present ? nextUser.value : this.nextUser, ); + User copyWithCompanion(UsersCompanion data) { + return User( + id: data.id.present ? data.id.value : this.id, + name: data.name.present ? data.name.value : this.name, + birthday: data.birthday.present ? data.birthday.value : this.birthday, + nextUser: data.nextUser.present ? data.nextUser.value : this.nextUser, + ); + } + @override String toString() { return (StringBuffer('User(') @@ -417,6 +426,15 @@ class Group extends DataClass implements Insertable { deleted: deleted.present ? deleted.value : this.deleted, owner: owner ?? this.owner, ); + Group copyWithCompanion(GroupsCompanion data) { + return Group( + id: data.id.present ? data.id.value : this.id, + title: data.title.present ? data.title.value : this.title, + deleted: data.deleted.present ? data.deleted.value : this.deleted, + owner: data.owner.present ? data.owner.value : this.owner, + ); + } + @override String toString() { return (StringBuffer('Group(') @@ -650,6 +668,15 @@ class Note extends DataClass implements Insertable { content: content ?? this.content, searchTerms: searchTerms ?? this.searchTerms, ); + Note copyWithCompanion(NotesCompanion data) { + return Note( + title: data.title.present ? data.title.value : this.title, + content: data.content.present ? data.content.value : this.content, + searchTerms: + data.searchTerms.present ? data.searchTerms.value : this.searchTerms, + ); + } + @override String toString() { return (StringBuffer('Note(') @@ -902,7 +929,7 @@ abstract class _$Database extends GeneratedDatabase { const DriftDatabaseOptions(storeDateTimeAsText: true); } -typedef $$UsersTableInsertCompanionBuilder = UsersCompanion Function({ +typedef $$UsersTableCreateCompanionBuilder = UsersCompanion Function({ Value id, Value name, Value birthday, @@ -921,8 +948,7 @@ class $$UsersTableTableManager extends RootTableManager< User, $$UsersTableFilterComposer, $$UsersTableOrderingComposer, - $$UsersTableProcessedTableManager, - $$UsersTableInsertCompanionBuilder, + $$UsersTableCreateCompanionBuilder, $$UsersTableUpdateCompanionBuilder> { $$UsersTableTableManager(_$Database db, $UsersTable table) : super(TableManagerState( @@ -932,8 +958,7 @@ class $$UsersTableTableManager extends RootTableManager< $$UsersTableFilterComposer(ComposerState(db, table)), orderingComposer: $$UsersTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => $$UsersTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value id = const Value.absent(), Value name = const Value.absent(), Value birthday = const Value.absent(), @@ -945,7 +970,7 @@ class $$UsersTableTableManager extends RootTableManager< birthday: birthday, nextUser: nextUser, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value id = const Value.absent(), Value name = const Value.absent(), Value birthday = const Value.absent(), @@ -960,18 +985,6 @@ class $$UsersTableTableManager extends RootTableManager< )); } -class $$UsersTableProcessedTableManager extends ProcessedTableManager< - _$Database, - $UsersTable, - User, - $$UsersTableFilterComposer, - $$UsersTableOrderingComposer, - $$UsersTableProcessedTableManager, - $$UsersTableInsertCompanionBuilder, - $$UsersTableUpdateCompanionBuilder> { - $$UsersTableProcessedTableManager(super.$state); -} - class $$UsersTableFilterComposer extends FilterComposer<_$Database, $UsersTable> { $$UsersTableFilterComposer(super.$state); @@ -1047,7 +1060,7 @@ class $$UsersTableOrderingComposer } } -typedef $GroupsInsertCompanionBuilder = GroupsCompanion Function({ +typedef $GroupsCreateCompanionBuilder = GroupsCompanion Function({ Value id, required String title, Value deleted, @@ -1066,8 +1079,7 @@ class $GroupsTableManager extends RootTableManager< Group, $GroupsFilterComposer, $GroupsOrderingComposer, - $GroupsProcessedTableManager, - $GroupsInsertCompanionBuilder, + $GroupsCreateCompanionBuilder, $GroupsUpdateCompanionBuilder> { $GroupsTableManager(_$Database db, Groups table) : super(TableManagerState( @@ -1075,8 +1087,7 @@ class $GroupsTableManager extends RootTableManager< table: table, filteringComposer: $GroupsFilterComposer(ComposerState(db, table)), orderingComposer: $GroupsOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => $GroupsProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value id = const Value.absent(), Value title = const Value.absent(), Value deleted = const Value.absent(), @@ -1088,7 +1099,7 @@ class $GroupsTableManager extends RootTableManager< deleted: deleted, owner: owner, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value id = const Value.absent(), required String title, Value deleted = const Value.absent(), @@ -1103,18 +1114,6 @@ class $GroupsTableManager extends RootTableManager< )); } -class $GroupsProcessedTableManager extends ProcessedTableManager< - _$Database, - Groups, - Group, - $GroupsFilterComposer, - $GroupsOrderingComposer, - $GroupsProcessedTableManager, - $GroupsInsertCompanionBuilder, - $GroupsUpdateCompanionBuilder> { - $GroupsProcessedTableManager(super.$state); -} - class $GroupsFilterComposer extends FilterComposer<_$Database, Groups> { $GroupsFilterComposer(super.$state); ColumnFilters get id => $state.composableBuilder( @@ -1175,7 +1174,7 @@ class $GroupsOrderingComposer extends OrderingComposer<_$Database, Groups> { } } -typedef $NotesInsertCompanionBuilder = NotesCompanion Function({ +typedef $NotesCreateCompanionBuilder = NotesCompanion Function({ required String title, required String content, required String searchTerms, @@ -1194,8 +1193,7 @@ class $NotesTableManager extends RootTableManager< Note, $NotesFilterComposer, $NotesOrderingComposer, - $NotesProcessedTableManager, - $NotesInsertCompanionBuilder, + $NotesCreateCompanionBuilder, $NotesUpdateCompanionBuilder> { $NotesTableManager(_$Database db, Notes table) : super(TableManagerState( @@ -1203,8 +1201,7 @@ class $NotesTableManager extends RootTableManager< table: table, filteringComposer: $NotesFilterComposer(ComposerState(db, table)), orderingComposer: $NotesOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => $NotesProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value title = const Value.absent(), Value content = const Value.absent(), Value searchTerms = const Value.absent(), @@ -1216,7 +1213,7 @@ class $NotesTableManager extends RootTableManager< searchTerms: searchTerms, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ required String title, required String content, required String searchTerms, @@ -1231,18 +1228,6 @@ class $NotesTableManager extends RootTableManager< )); } -class $NotesProcessedTableManager extends ProcessedTableManager< - _$Database, - Notes, - Note, - $NotesFilterComposer, - $NotesOrderingComposer, - $NotesProcessedTableManager, - $NotesInsertCompanionBuilder, - $NotesUpdateCompanionBuilder> { - $NotesProcessedTableManager(super.$state); -} - class $NotesFilterComposer extends FilterComposer<_$Database, Notes> { $NotesFilterComposer(super.$state); ColumnFilters get title => $state.composableBuilder( diff --git a/examples/modular/lib/src/posts.drift.dart b/examples/modular/lib/src/posts.drift.dart index 337a1d2de..bc8f0a9ef 100644 --- a/examples/modular/lib/src/posts.drift.dart +++ b/examples/modular/lib/src/posts.drift.dart @@ -225,7 +225,7 @@ class PostsCompanion extends i0.UpdateCompanion { } } -typedef $PostsInsertCompanionBuilder = i1.PostsCompanion Function({ +typedef $PostsCreateCompanionBuilder = i1.PostsCompanion Function({ i0.Value id, required int author, i0.Value content, @@ -242,8 +242,7 @@ class $PostsTableManager extends i0.RootTableManager< i1.Post, i1.$PostsFilterComposer, i1.$PostsOrderingComposer, - $PostsProcessedTableManager, - $PostsInsertCompanionBuilder, + $PostsCreateCompanionBuilder, $PostsUpdateCompanionBuilder> { $PostsTableManager(i0.GeneratedDatabase db, i1.Posts table) : super(i0.TableManagerState( @@ -253,8 +252,7 @@ class $PostsTableManager extends i0.RootTableManager< i1.$PostsFilterComposer(i0.ComposerState(db, table)), orderingComposer: i1.$PostsOrderingComposer(i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => $PostsProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value id = const i0.Value.absent(), i0.Value author = const i0.Value.absent(), i0.Value content = const i0.Value.absent(), @@ -264,7 +262,7 @@ class $PostsTableManager extends i0.RootTableManager< author: author, content: content, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ i0.Value id = const i0.Value.absent(), required int author, i0.Value content = const i0.Value.absent(), @@ -277,18 +275,6 @@ class $PostsTableManager extends i0.RootTableManager< )); } -class $PostsProcessedTableManager extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i1.Posts, - i1.Post, - i1.$PostsFilterComposer, - i1.$PostsOrderingComposer, - $PostsProcessedTableManager, - $PostsInsertCompanionBuilder, - $PostsUpdateCompanionBuilder> { - $PostsProcessedTableManager(super.$state); -} - class $PostsFilterComposer extends i0.FilterComposer { $PostsFilterComposer(super.$state); @@ -547,7 +533,7 @@ class LikesCompanion extends i0.UpdateCompanion { } } -typedef $LikesInsertCompanionBuilder = i1.LikesCompanion Function({ +typedef $LikesCreateCompanionBuilder = i1.LikesCompanion Function({ required int post, required int likedBy, i0.Value rowid, @@ -564,8 +550,7 @@ class $LikesTableManager extends i0.RootTableManager< i1.Like, i1.$LikesFilterComposer, i1.$LikesOrderingComposer, - $LikesProcessedTableManager, - $LikesInsertCompanionBuilder, + $LikesCreateCompanionBuilder, $LikesUpdateCompanionBuilder> { $LikesTableManager(i0.GeneratedDatabase db, i1.Likes table) : super(i0.TableManagerState( @@ -575,8 +560,7 @@ class $LikesTableManager extends i0.RootTableManager< i1.$LikesFilterComposer(i0.ComposerState(db, table)), orderingComposer: i1.$LikesOrderingComposer(i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => $LikesProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value post = const i0.Value.absent(), i0.Value likedBy = const i0.Value.absent(), i0.Value rowid = const i0.Value.absent(), @@ -586,7 +570,7 @@ class $LikesTableManager extends i0.RootTableManager< likedBy: likedBy, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ required int post, required int likedBy, i0.Value rowid = const i0.Value.absent(), @@ -599,18 +583,6 @@ class $LikesTableManager extends i0.RootTableManager< )); } -class $LikesProcessedTableManager extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i1.Likes, - i1.Like, - i1.$LikesFilterComposer, - i1.$LikesOrderingComposer, - $LikesProcessedTableManager, - $LikesInsertCompanionBuilder, - $LikesUpdateCompanionBuilder> { - $LikesProcessedTableManager(super.$state); -} - class $LikesFilterComposer extends i0.FilterComposer { $LikesFilterComposer(super.$state); diff --git a/examples/modular/lib/src/search.drift.dart b/examples/modular/lib/src/search.drift.dart index 58966c478..97330f409 100644 --- a/examples/modular/lib/src/search.drift.dart +++ b/examples/modular/lib/src/search.drift.dart @@ -211,7 +211,7 @@ class SearchInPostsCompanion extends i0.UpdateCompanion { } } -typedef $SearchInPostsInsertCompanionBuilder = i1.SearchInPostsCompanion +typedef $SearchInPostsCreateCompanionBuilder = i1.SearchInPostsCompanion Function({ required String author, required String content, @@ -230,8 +230,7 @@ class $SearchInPostsTableManager extends i0.RootTableManager< i1.SearchInPost, i1.$SearchInPostsFilterComposer, i1.$SearchInPostsOrderingComposer, - $SearchInPostsProcessedTableManager, - $SearchInPostsInsertCompanionBuilder, + $SearchInPostsCreateCompanionBuilder, $SearchInPostsUpdateCompanionBuilder> { $SearchInPostsTableManager(i0.GeneratedDatabase db, i1.SearchInPosts table) : super(i0.TableManagerState( @@ -241,8 +240,7 @@ class $SearchInPostsTableManager extends i0.RootTableManager< i1.$SearchInPostsFilterComposer(i0.ComposerState(db, table)), orderingComposer: i1.$SearchInPostsOrderingComposer(i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => $SearchInPostsProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value author = const i0.Value.absent(), i0.Value content = const i0.Value.absent(), i0.Value rowid = const i0.Value.absent(), @@ -252,7 +250,7 @@ class $SearchInPostsTableManager extends i0.RootTableManager< content: content, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ required String author, required String content, i0.Value rowid = const i0.Value.absent(), @@ -265,18 +263,6 @@ class $SearchInPostsTableManager extends i0.RootTableManager< )); } -class $SearchInPostsProcessedTableManager extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i1.SearchInPosts, - i1.SearchInPost, - i1.$SearchInPostsFilterComposer, - i1.$SearchInPostsOrderingComposer, - $SearchInPostsProcessedTableManager, - $SearchInPostsInsertCompanionBuilder, - $SearchInPostsUpdateCompanionBuilder> { - $SearchInPostsProcessedTableManager(super.$state); -} - class $SearchInPostsFilterComposer extends i0.FilterComposer { $SearchInPostsFilterComposer(super.$state); diff --git a/examples/modular/lib/src/users.drift.dart b/examples/modular/lib/src/users.drift.dart index 147bd01f7..29c735234 100644 --- a/examples/modular/lib/src/users.drift.dart +++ b/examples/modular/lib/src/users.drift.dart @@ -327,7 +327,7 @@ class UsersCompanion extends i0.UpdateCompanion { } } -typedef $UsersInsertCompanionBuilder = i1.UsersCompanion Function({ +typedef $UsersCreateCompanionBuilder = i1.UsersCompanion Function({ i0.Value id, required String name, i0.Value biography, @@ -348,8 +348,7 @@ class $UsersTableManager extends i0.RootTableManager< i1.User, i1.$UsersFilterComposer, i1.$UsersOrderingComposer, - $UsersProcessedTableManager, - $UsersInsertCompanionBuilder, + $UsersCreateCompanionBuilder, $UsersUpdateCompanionBuilder> { $UsersTableManager(i0.GeneratedDatabase db, i1.Users table) : super(i0.TableManagerState( @@ -359,8 +358,7 @@ class $UsersTableManager extends i0.RootTableManager< i1.$UsersFilterComposer(i0.ComposerState(db, table)), orderingComposer: i1.$UsersOrderingComposer(i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => $UsersProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value id = const i0.Value.absent(), i0.Value name = const i0.Value.absent(), i0.Value biography = const i0.Value.absent(), @@ -374,7 +372,7 @@ class $UsersTableManager extends i0.RootTableManager< preferences: preferences, profilePicture: profilePicture, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ i0.Value id = const i0.Value.absent(), required String name, i0.Value biography = const i0.Value.absent(), @@ -391,18 +389,6 @@ class $UsersTableManager extends i0.RootTableManager< )); } -class $UsersProcessedTableManager extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i1.Users, - i1.User, - i1.$UsersFilterComposer, - i1.$UsersOrderingComposer, - $UsersProcessedTableManager, - $UsersInsertCompanionBuilder, - $UsersUpdateCompanionBuilder> { - $UsersProcessedTableManager(super.$state); -} - class $UsersFilterComposer extends i0.FilterComposer { $UsersFilterComposer(super.$state); @@ -668,7 +654,7 @@ class FollowsCompanion extends i0.UpdateCompanion { } } -typedef $FollowsInsertCompanionBuilder = i1.FollowsCompanion Function({ +typedef $FollowsCreateCompanionBuilder = i1.FollowsCompanion Function({ required int followed, required int follower, i0.Value rowid, @@ -685,8 +671,7 @@ class $FollowsTableManager extends i0.RootTableManager< i1.Follow, i1.$FollowsFilterComposer, i1.$FollowsOrderingComposer, - $FollowsProcessedTableManager, - $FollowsInsertCompanionBuilder, + $FollowsCreateCompanionBuilder, $FollowsUpdateCompanionBuilder> { $FollowsTableManager(i0.GeneratedDatabase db, i1.Follows table) : super(i0.TableManagerState( @@ -696,8 +681,7 @@ class $FollowsTableManager extends i0.RootTableManager< i1.$FollowsFilterComposer(i0.ComposerState(db, table)), orderingComposer: i1.$FollowsOrderingComposer(i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => $FollowsProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value followed = const i0.Value.absent(), i0.Value follower = const i0.Value.absent(), i0.Value rowid = const i0.Value.absent(), @@ -707,7 +691,7 @@ class $FollowsTableManager extends i0.RootTableManager< follower: follower, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ required int followed, required int follower, i0.Value rowid = const i0.Value.absent(), @@ -720,18 +704,6 @@ class $FollowsTableManager extends i0.RootTableManager< )); } -class $FollowsProcessedTableManager extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i1.Follows, - i1.Follow, - i1.$FollowsFilterComposer, - i1.$FollowsOrderingComposer, - $FollowsProcessedTableManager, - $FollowsInsertCompanionBuilder, - $FollowsUpdateCompanionBuilder> { - $FollowsProcessedTableManager(super.$state); -} - class $FollowsFilterComposer extends i0.FilterComposer { $FollowsFilterComposer(super.$state); diff --git a/examples/multi_package/server/lib/database.drift.dart b/examples/multi_package/server/lib/database.drift.dart index d77d0dfc5..c1311d5de 100644 --- a/examples/multi_package/server/lib/database.drift.dart +++ b/examples/multi_package/server/lib/database.drift.dart @@ -149,6 +149,14 @@ class ActiveSession extends i0.DataClass user: user ?? this.user, bearerToken: bearerToken ?? this.bearerToken, ); + ActiveSession copyWithCompanion(i3.ActiveSessionsCompanion data) { + return ActiveSession( + user: data.user.present ? data.user.value : this.user, + bearerToken: + data.bearerToken.present ? data.bearerToken.value : this.bearerToken, + ); + } + @override String toString() { return (StringBuffer('ActiveSession(') @@ -232,7 +240,7 @@ class ActiveSessionsCompanion extends i0.UpdateCompanion { } } -typedef $$ActiveSessionsTableInsertCompanionBuilder = i3.ActiveSessionsCompanion +typedef $$ActiveSessionsTableCreateCompanionBuilder = i3.ActiveSessionsCompanion Function({ required int user, required String bearerToken, @@ -251,8 +259,7 @@ class $$ActiveSessionsTableTableManager extends i0.RootTableManager< i3.ActiveSession, i3.$$ActiveSessionsTableFilterComposer, i3.$$ActiveSessionsTableOrderingComposer, - $$ActiveSessionsTableProcessedTableManager, - $$ActiveSessionsTableInsertCompanionBuilder, + $$ActiveSessionsTableCreateCompanionBuilder, $$ActiveSessionsTableUpdateCompanionBuilder> { $$ActiveSessionsTableTableManager( i0.GeneratedDatabase db, i3.$ActiveSessionsTable table) @@ -263,9 +270,7 @@ class $$ActiveSessionsTableTableManager extends i0.RootTableManager< .$$ActiveSessionsTableFilterComposer(i0.ComposerState(db, table)), orderingComposer: i3.$$ActiveSessionsTableOrderingComposer( i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$ActiveSessionsTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value user = const i0.Value.absent(), i0.Value bearerToken = const i0.Value.absent(), i0.Value rowid = const i0.Value.absent(), @@ -275,7 +280,7 @@ class $$ActiveSessionsTableTableManager extends i0.RootTableManager< bearerToken: bearerToken, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ required int user, required String bearerToken, i0.Value rowid = const i0.Value.absent(), @@ -288,19 +293,6 @@ class $$ActiveSessionsTableTableManager extends i0.RootTableManager< )); } -class $$ActiveSessionsTableProcessedTableManager - extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i3.$ActiveSessionsTable, - i3.ActiveSession, - i3.$$ActiveSessionsTableFilterComposer, - i3.$$ActiveSessionsTableOrderingComposer, - $$ActiveSessionsTableProcessedTableManager, - $$ActiveSessionsTableInsertCompanionBuilder, - $$ActiveSessionsTableUpdateCompanionBuilder> { - $$ActiveSessionsTableProcessedTableManager(super.$state); -} - class $$ActiveSessionsTableFilterComposer extends i0.FilterComposer { $$ActiveSessionsTableFilterComposer(super.$state); diff --git a/examples/multi_package/shared/lib/src/posts.drift.dart b/examples/multi_package/shared/lib/src/posts.drift.dart index af525e5f6..fb21becf8 100644 --- a/examples/multi_package/shared/lib/src/posts.drift.dart +++ b/examples/multi_package/shared/lib/src/posts.drift.dart @@ -116,6 +116,13 @@ class Post extends i0.DataClass implements i0.Insertable { author: author ?? this.author, content: content.present ? content.value : this.content, ); + Post copyWithCompanion(i1.PostsCompanion data) { + return Post( + author: data.author.present ? data.author.value : this.author, + content: data.content.present ? data.content.value : this.content, + ); + } + @override String toString() { return (StringBuffer('Post(') @@ -198,7 +205,7 @@ class PostsCompanion extends i0.UpdateCompanion { } } -typedef $PostsInsertCompanionBuilder = i1.PostsCompanion Function({ +typedef $PostsCreateCompanionBuilder = i1.PostsCompanion Function({ required int author, i0.Value content, i0.Value rowid, @@ -215,8 +222,7 @@ class $PostsTableManager extends i0.RootTableManager< i1.Post, i1.$PostsFilterComposer, i1.$PostsOrderingComposer, - $PostsProcessedTableManager, - $PostsInsertCompanionBuilder, + $PostsCreateCompanionBuilder, $PostsUpdateCompanionBuilder> { $PostsTableManager(i0.GeneratedDatabase db, i1.Posts table) : super(i0.TableManagerState( @@ -226,8 +232,7 @@ class $PostsTableManager extends i0.RootTableManager< i1.$PostsFilterComposer(i0.ComposerState(db, table)), orderingComposer: i1.$PostsOrderingComposer(i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => $PostsProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value author = const i0.Value.absent(), i0.Value content = const i0.Value.absent(), i0.Value rowid = const i0.Value.absent(), @@ -237,7 +242,7 @@ class $PostsTableManager extends i0.RootTableManager< content: content, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ required int author, i0.Value content = const i0.Value.absent(), i0.Value rowid = const i0.Value.absent(), @@ -250,18 +255,6 @@ class $PostsTableManager extends i0.RootTableManager< )); } -class $PostsProcessedTableManager extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i1.Posts, - i1.Post, - i1.$PostsFilterComposer, - i1.$PostsOrderingComposer, - $PostsProcessedTableManager, - $PostsInsertCompanionBuilder, - $PostsUpdateCompanionBuilder> { - $PostsProcessedTableManager(super.$state); -} - class $PostsFilterComposer extends i0.FilterComposer { $PostsFilterComposer(super.$state); diff --git a/examples/multi_package/shared/lib/src/users.drift.dart b/examples/multi_package/shared/lib/src/users.drift.dart index 459f3b763..d96a0869d 100644 --- a/examples/multi_package/shared/lib/src/users.drift.dart +++ b/examples/multi_package/shared/lib/src/users.drift.dart @@ -106,6 +106,13 @@ class User extends i0.DataClass implements i0.Insertable { id: id ?? this.id, name: name ?? this.name, ); + User copyWithCompanion(i1.UsersCompanion data) { + return User( + id: data.id.present ? data.id.value : this.id, + name: data.name.present ? data.name.value : this.name, + ); + } + @override String toString() { return (StringBuffer('User(') @@ -173,7 +180,7 @@ class UsersCompanion extends i0.UpdateCompanion { } } -typedef $$UsersTableInsertCompanionBuilder = i1.UsersCompanion Function({ +typedef $$UsersTableCreateCompanionBuilder = i1.UsersCompanion Function({ i0.Value id, required String name, }); @@ -188,8 +195,7 @@ class $$UsersTableTableManager extends i0.RootTableManager< i1.User, i1.$$UsersTableFilterComposer, i1.$$UsersTableOrderingComposer, - $$UsersTableProcessedTableManager, - $$UsersTableInsertCompanionBuilder, + $$UsersTableCreateCompanionBuilder, $$UsersTableUpdateCompanionBuilder> { $$UsersTableTableManager(i0.GeneratedDatabase db, i1.$UsersTable table) : super(i0.TableManagerState( @@ -199,8 +205,7 @@ class $$UsersTableTableManager extends i0.RootTableManager< i1.$$UsersTableFilterComposer(i0.ComposerState(db, table)), orderingComposer: i1.$$UsersTableOrderingComposer(i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => $$UsersTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value id = const i0.Value.absent(), i0.Value name = const i0.Value.absent(), }) => @@ -208,7 +213,7 @@ class $$UsersTableTableManager extends i0.RootTableManager< id: id, name: name, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ i0.Value id = const i0.Value.absent(), required String name, }) => @@ -219,18 +224,6 @@ class $$UsersTableTableManager extends i0.RootTableManager< )); } -class $$UsersTableProcessedTableManager extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i1.$UsersTable, - i1.User, - i1.$$UsersTableFilterComposer, - i1.$$UsersTableOrderingComposer, - $$UsersTableProcessedTableManager, - $$UsersTableInsertCompanionBuilder, - $$UsersTableUpdateCompanionBuilder> { - $$UsersTableProcessedTableManager(super.$state); -} - class $$UsersTableFilterComposer extends i0.FilterComposer { $$UsersTableFilterComposer(super.$state); diff --git a/examples/web_worker_example/lib/database.g.dart b/examples/web_worker_example/lib/database.g.dart index 06e4c94e0..25feb5e2b 100644 --- a/examples/web_worker_example/lib/database.g.dart +++ b/examples/web_worker_example/lib/database.g.dart @@ -106,6 +106,13 @@ class Entry extends DataClass implements Insertable { id: id ?? this.id, value: value ?? this.value, ); + Entry copyWithCompanion(EntriesCompanion data) { + return Entry( + id: data.id.present ? data.id.value : this.id, + value: data.value.present ? data.value.value : this.value, + ); + } + @override String toString() { return (StringBuffer('Entry(') diff --git a/examples/with_built_value/lib/tables.drift.dart b/examples/with_built_value/lib/tables.drift.dart index 4367d0d59..2af2ccf43 100644 --- a/examples/with_built_value/lib/tables.drift.dart +++ b/examples/with_built_value/lib/tables.drift.dart @@ -107,6 +107,13 @@ class User extends i0.DataClass implements i0.Insertable { id: id ?? this.id, name: name ?? this.name, ); + User copyWithCompanion(i1.UsersCompanion data) { + return User( + id: data.id.present ? data.id.value : this.id, + name: data.name.present ? data.name.value : this.name, + ); + } + @override String toString() { return (StringBuffer('User(') @@ -174,7 +181,7 @@ class UsersCompanion extends i0.UpdateCompanion { } } -typedef $UsersInsertCompanionBuilder = i1.UsersCompanion Function({ +typedef $UsersCreateCompanionBuilder = i1.UsersCompanion Function({ i0.Value id, required String name, }); @@ -189,8 +196,7 @@ class $UsersTableManager extends i0.RootTableManager< i1.User, i1.$UsersFilterComposer, i1.$UsersOrderingComposer, - $UsersProcessedTableManager, - $UsersInsertCompanionBuilder, + $UsersCreateCompanionBuilder, $UsersUpdateCompanionBuilder> { $UsersTableManager(i0.GeneratedDatabase db, i1.Users table) : super(i0.TableManagerState( @@ -200,8 +206,7 @@ class $UsersTableManager extends i0.RootTableManager< i1.$UsersFilterComposer(i0.ComposerState(db, table)), orderingComposer: i1.$UsersOrderingComposer(i0.ComposerState(db, table)), - getChildManagerBuilder: (p) => $UsersProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ i0.Value id = const i0.Value.absent(), i0.Value name = const i0.Value.absent(), }) => @@ -209,7 +214,7 @@ class $UsersTableManager extends i0.RootTableManager< id: id, name: name, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ i0.Value id = const i0.Value.absent(), required String name, }) => @@ -220,18 +225,6 @@ class $UsersTableManager extends i0.RootTableManager< )); } -class $UsersProcessedTableManager extends i0.ProcessedTableManager< - i0.GeneratedDatabase, - i1.Users, - i1.User, - i1.$UsersFilterComposer, - i1.$UsersOrderingComposer, - $UsersProcessedTableManager, - $UsersInsertCompanionBuilder, - $UsersUpdateCompanionBuilder> { - $UsersProcessedTableManager(super.$state); -} - class $UsersFilterComposer extends i0.FilterComposer { $UsersFilterComposer(super.$state); diff --git a/extras/benchmarks/lib/src/moor/database.g.dart b/extras/benchmarks/lib/src/moor/database.g.dart index a2350074b..5e67db24a 100644 --- a/extras/benchmarks/lib/src/moor/database.g.dart +++ b/extras/benchmarks/lib/src/moor/database.g.dart @@ -105,6 +105,13 @@ class KeyValue extends DataClass implements Insertable { key: key ?? this.key, value: value ?? this.value, ); + KeyValue copyWithCompanion(KeyValuesCompanion data) { + return KeyValue( + key: data.key.present ? data.key.value : this.key, + value: data.value.present ? data.value.value : this.value, + ); + } + @override String toString() { return (StringBuffer('KeyValue(') diff --git a/extras/drift_postgres/example/main.g.dart b/extras/drift_postgres/example/main.g.dart index 6c67251d8..93ac20026 100644 --- a/extras/drift_postgres/example/main.g.dart +++ b/extras/drift_postgres/example/main.g.dart @@ -103,6 +103,13 @@ class User extends DataClass implements Insertable { id: id ?? this.id, name: name ?? this.name, ); + User copyWithCompanion(UsersCompanion data) { + return User( + id: data.id.present ? data.id.value : this.id, + name: data.name.present ? data.name.value : this.name, + ); + } + @override String toString() { return (StringBuffer('User(') @@ -193,7 +200,7 @@ abstract class _$DriftPostgresDatabase extends GeneratedDatabase { List get allSchemaEntities => [users]; } -typedef $$UsersTableInsertCompanionBuilder = UsersCompanion Function({ +typedef $$UsersTableCreateCompanionBuilder = UsersCompanion Function({ Value id, required String name, Value rowid, @@ -210,8 +217,7 @@ class $$UsersTableTableManager extends RootTableManager< User, $$UsersTableFilterComposer, $$UsersTableOrderingComposer, - $$UsersTableProcessedTableManager, - $$UsersTableInsertCompanionBuilder, + $$UsersTableCreateCompanionBuilder, $$UsersTableUpdateCompanionBuilder> { $$UsersTableTableManager(_$DriftPostgresDatabase db, $UsersTable table) : super(TableManagerState( @@ -221,8 +227,7 @@ class $$UsersTableTableManager extends RootTableManager< $$UsersTableFilterComposer(ComposerState(db, table)), orderingComposer: $$UsersTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => $$UsersTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value id = const Value.absent(), Value name = const Value.absent(), Value rowid = const Value.absent(), @@ -232,7 +237,7 @@ class $$UsersTableTableManager extends RootTableManager< name: name, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value id = const Value.absent(), required String name, Value rowid = const Value.absent(), @@ -245,18 +250,6 @@ class $$UsersTableTableManager extends RootTableManager< )); } -class $$UsersTableProcessedTableManager extends ProcessedTableManager< - _$DriftPostgresDatabase, - $UsersTable, - User, - $$UsersTableFilterComposer, - $$UsersTableOrderingComposer, - $$UsersTableProcessedTableManager, - $$UsersTableInsertCompanionBuilder, - $$UsersTableUpdateCompanionBuilder> { - $$UsersTableProcessedTableManager(super.$state); -} - class $$UsersTableFilterComposer extends FilterComposer<_$DriftPostgresDatabase, $UsersTable> { $$UsersTableFilterComposer(super.$state); diff --git a/extras/integration_tests/drift_testcases/lib/database/database.g.dart b/extras/integration_tests/drift_testcases/lib/database/database.g.dart index 6adbd4f96..f9283550f 100644 --- a/extras/integration_tests/drift_testcases/lib/database/database.g.dart +++ b/extras/integration_tests/drift_testcases/lib/database/database.g.dart @@ -199,6 +199,19 @@ class User extends DataClass implements Insertable { profilePicture.present ? profilePicture.value : this.profilePicture, preferences: preferences.present ? preferences.value : this.preferences, ); + User copyWithCompanion(UsersCompanion data) { + return User( + id: data.id.present ? data.id.value : this.id, + name: data.name.present ? data.name.value : this.name, + birthDate: data.birthDate.present ? data.birthDate.value : this.birthDate, + profilePicture: data.profilePicture.present + ? data.profilePicture.value + : this.profilePicture, + preferences: + data.preferences.present ? data.preferences.value : this.preferences, + ); + } + @override String toString() { return (StringBuffer('User(') @@ -457,6 +470,17 @@ class Friendship extends DataClass implements Insertable { secondUser: secondUser ?? this.secondUser, reallyGoodFriends: reallyGoodFriends ?? this.reallyGoodFriends, ); + Friendship copyWithCompanion(FriendshipsCompanion data) { + return Friendship( + firstUser: data.firstUser.present ? data.firstUser.value : this.firstUser, + secondUser: + data.secondUser.present ? data.secondUser.value : this.secondUser, + reallyGoodFriends: data.reallyGoodFriends.present + ? data.reallyGoodFriends.value + : this.reallyGoodFriends, + ); + } + @override String toString() { return (StringBuffer('Friendship(') @@ -694,7 +718,7 @@ abstract class _$Database extends GeneratedDatabase { List get allSchemaEntities => [users, friendships]; } -typedef $$UsersTableInsertCompanionBuilder = UsersCompanion Function({ +typedef $$UsersTableCreateCompanionBuilder = UsersCompanion Function({ Value id, required String name, required DateTime birthDate, @@ -715,8 +739,7 @@ class $$UsersTableTableManager extends RootTableManager< User, $$UsersTableFilterComposer, $$UsersTableOrderingComposer, - $$UsersTableProcessedTableManager, - $$UsersTableInsertCompanionBuilder, + $$UsersTableCreateCompanionBuilder, $$UsersTableUpdateCompanionBuilder> { $$UsersTableTableManager(_$Database db, $UsersTable table) : super(TableManagerState( @@ -726,8 +749,7 @@ class $$UsersTableTableManager extends RootTableManager< $$UsersTableFilterComposer(ComposerState(db, table)), orderingComposer: $$UsersTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => $$UsersTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value id = const Value.absent(), Value name = const Value.absent(), Value birthDate = const Value.absent(), @@ -741,7 +763,7 @@ class $$UsersTableTableManager extends RootTableManager< profilePicture: profilePicture, preferences: preferences, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value id = const Value.absent(), required String name, required DateTime birthDate, @@ -758,18 +780,6 @@ class $$UsersTableTableManager extends RootTableManager< )); } -class $$UsersTableProcessedTableManager extends ProcessedTableManager< - _$Database, - $UsersTable, - User, - $$UsersTableFilterComposer, - $$UsersTableOrderingComposer, - $$UsersTableProcessedTableManager, - $$UsersTableInsertCompanionBuilder, - $$UsersTableUpdateCompanionBuilder> { - $$UsersTableProcessedTableManager(super.$state); -} - class $$UsersTableFilterComposer extends FilterComposer<_$Database, $UsersTable> { $$UsersTableFilterComposer(super.$state); @@ -830,7 +840,7 @@ class $$UsersTableOrderingComposer ColumnOrderings(column, joinBuilders: joinBuilders)); } -typedef $$FriendshipsTableInsertCompanionBuilder = FriendshipsCompanion +typedef $$FriendshipsTableCreateCompanionBuilder = FriendshipsCompanion Function({ required int firstUser, required int secondUser, @@ -851,8 +861,7 @@ class $$FriendshipsTableTableManager extends RootTableManager< Friendship, $$FriendshipsTableFilterComposer, $$FriendshipsTableOrderingComposer, - $$FriendshipsTableProcessedTableManager, - $$FriendshipsTableInsertCompanionBuilder, + $$FriendshipsTableCreateCompanionBuilder, $$FriendshipsTableUpdateCompanionBuilder> { $$FriendshipsTableTableManager(_$Database db, $FriendshipsTable table) : super(TableManagerState( @@ -862,9 +871,7 @@ class $$FriendshipsTableTableManager extends RootTableManager< $$FriendshipsTableFilterComposer(ComposerState(db, table)), orderingComposer: $$FriendshipsTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$FriendshipsTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value firstUser = const Value.absent(), Value secondUser = const Value.absent(), Value reallyGoodFriends = const Value.absent(), @@ -876,7 +883,7 @@ class $$FriendshipsTableTableManager extends RootTableManager< reallyGoodFriends: reallyGoodFriends, rowid: rowid, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ required int firstUser, required int secondUser, Value reallyGoodFriends = const Value.absent(), @@ -891,18 +898,6 @@ class $$FriendshipsTableTableManager extends RootTableManager< )); } -class $$FriendshipsTableProcessedTableManager extends ProcessedTableManager< - _$Database, - $FriendshipsTable, - Friendship, - $$FriendshipsTableFilterComposer, - $$FriendshipsTableOrderingComposer, - $$FriendshipsTableProcessedTableManager, - $$FriendshipsTableInsertCompanionBuilder, - $$FriendshipsTableUpdateCompanionBuilder> { - $$FriendshipsTableProcessedTableManager(super.$state); -} - class $$FriendshipsTableFilterComposer extends FilterComposer<_$Database, $FriendshipsTable> { $$FriendshipsTableFilterComposer(super.$state); diff --git a/extras/integration_tests/legacy_web/test/saves_after_migration_regression_test.g.dart b/extras/integration_tests/legacy_web/test/saves_after_migration_regression_test.g.dart index faf64e61f..26abd3b6b 100644 --- a/extras/integration_tests/legacy_web/test/saves_after_migration_regression_test.g.dart +++ b/extras/integration_tests/legacy_web/test/saves_after_migration_regression_test.g.dart @@ -86,6 +86,12 @@ class Foo extends DataClass implements Insertable { Foo copyWith({int? id}) => Foo( id: id ?? this.id, ); + Foo copyWithCompanion(FoosCompanion data) { + return Foo( + id: data.id.present ? data.id.value : this.id, + ); + } + @override String toString() { return (StringBuffer('Foo(') @@ -224,6 +230,12 @@ class Bar extends DataClass implements Insertable { Bar copyWith({int? id}) => Bar( id: id ?? this.id, ); + Bar copyWithCompanion(BarsCompanion data) { + return Bar( + id: data.id.present ? data.id.value : this.id, + ); + } + @override String toString() { return (StringBuffer('Bar(') diff --git a/extras/integration_tests/web_wasm/lib/src/database.g.dart b/extras/integration_tests/web_wasm/lib/src/database.g.dart index 625663a19..04931b8f9 100644 --- a/extras/integration_tests/web_wasm/lib/src/database.g.dart +++ b/extras/integration_tests/web_wasm/lib/src/database.g.dart @@ -107,6 +107,13 @@ class TestTableData extends DataClass implements Insertable { id: id ?? this.id, content: content ?? this.content, ); + TestTableData copyWithCompanion(TestTableCompanion data) { + return TestTableData( + id: data.id.present ? data.id.value : this.id, + content: data.content.present ? data.content.value : this.content, + ); + } + @override String toString() { return (StringBuffer('TestTableData(') @@ -187,7 +194,7 @@ abstract class _$TestDatabase extends GeneratedDatabase { List get allSchemaEntities => [testTable]; } -typedef $$TestTableTableInsertCompanionBuilder = TestTableCompanion Function({ +typedef $$TestTableTableCreateCompanionBuilder = TestTableCompanion Function({ Value id, required String content, }); @@ -202,8 +209,7 @@ class $$TestTableTableTableManager extends RootTableManager< TestTableData, $$TestTableTableFilterComposer, $$TestTableTableOrderingComposer, - $$TestTableTableProcessedTableManager, - $$TestTableTableInsertCompanionBuilder, + $$TestTableTableCreateCompanionBuilder, $$TestTableTableUpdateCompanionBuilder> { $$TestTableTableTableManager(_$TestDatabase db, $TestTableTable table) : super(TableManagerState( @@ -213,9 +219,7 @@ class $$TestTableTableTableManager extends RootTableManager< $$TestTableTableFilterComposer(ComposerState(db, table)), orderingComposer: $$TestTableTableOrderingComposer(ComposerState(db, table)), - getChildManagerBuilder: (p) => - $$TestTableTableProcessedTableManager(p), - getUpdateCompanionBuilder: ({ + updateCompanionCallback: ({ Value id = const Value.absent(), Value content = const Value.absent(), }) => @@ -223,7 +227,7 @@ class $$TestTableTableTableManager extends RootTableManager< id: id, content: content, ), - getInsertCompanionBuilder: ({ + createCompanionCallback: ({ Value id = const Value.absent(), required String content, }) => @@ -234,18 +238,6 @@ class $$TestTableTableTableManager extends RootTableManager< )); } -class $$TestTableTableProcessedTableManager extends ProcessedTableManager< - _$TestDatabase, - $TestTableTable, - TestTableData, - $$TestTableTableFilterComposer, - $$TestTableTableOrderingComposer, - $$TestTableTableProcessedTableManager, - $$TestTableTableInsertCompanionBuilder, - $$TestTableTableUpdateCompanionBuilder> { - $$TestTableTableProcessedTableManager(super.$state); -} - class $$TestTableTableFilterComposer extends FilterComposer<_$TestDatabase, $TestTableTable> { $$TestTableTableFilterComposer(super.$state);