non-null-refs getter for non-null references

simolus3 · Oct 27, 2024 · 15994a3 · 15994a3
1 parent 6d31b37
commit 15994a3
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 50 deletions.
diff --git a/drift/example/main.g.dart b/drift/example/main.g.dart
diff --git a/drift/test/generated/todos.dart b/drift/test/generated/todos.dart
@@ -125,7 +125,7 @@ class Product extends Table {
 class Listing extends Table {
   IntColumn get id => integer().autoIncrement()();
   @ReferenceName('listings')
-  TextColumn get product => text().references(Product, #sku).nullable()();
+  TextColumn get product => text().references(Product, #sku)();
   @ReferenceName('listings')
   IntColumn get store => integer().references(Store, #id).nullable()();
   RealColumn get price => real().nullable()();

diff --git a/drift/test/generated/todos.g.dart b/drift/test/generated/todos.g.dart
diff --git a/drift/test/manager/manager_computed_fields_test.dart b/drift/test/manager/manager_computed_fields_test.dart
@@ -31,9 +31,7 @@ void main() {
 
     listings = await _listingsData.mapAsyncAndAwait(
       (p0) => db.managers.listing.createReturning((o) => o(
-          product: Value(p0.product),
-          store: Value(p0.store),
-          price: Value(p0.price))),
+          product: p0.product, store: Value(p0.store), price: Value(p0.price))),
     );
   });
 

diff --git a/drift/test/manager/manager_prefetch_test.dart b/drift/test/manager/manager_prefetch_test.dart
@@ -126,9 +126,7 @@ void main() {
     await db.managers.listing.bulkCreate(
       (o) {
         return listingsData.map((e) => o(
-            product: Value(e.product),
-            store: Value(e.store),
-            price: Value(e.price)));
+            product: e.product, store: Value(e.store), price: Value(e.price)));
       },
     );
 
@@ -163,9 +161,7 @@ void main() {
     await db.managers.listing.bulkCreate(
       (o) {
         return listingsData.map((e) => o(
-            product: Value(e.product),
-            store: Value(e.store),
-            price: Value(e.price)));
+            product: e.product, store: Value(e.store), price: Value(e.price)));
       },
     );
 

diff --git a/drift/test/manager/manager_referenced_filter_test.dart b/drift/test/manager/manager_referenced_filter_test.dart
@@ -33,9 +33,7 @@ void main() {
 
     listings = await _listingsData.mapAsyncAndAwait(
       (p0) => db.managers.listing.createReturning((o) => o(
-          product: Value(p0.product),
-          store: Value(p0.store),
-          price: Value(p0.price))),
+          product: p0.product, store: Value(p0.store), price: Value(p0.price))),
     );
 
     final categories =
@@ -582,13 +580,12 @@ void main() {
     final listingsWithProducts = <ProductData, List<ListingData>>{};
     for (final i
         in await db.managers.listing.withReferences().get(distinct: true)) {
-      final product = await i.$2.product?.getSingle();
-      if (product != null) {
-        if (!listingsWithProducts.containsKey(product)) {
-          listingsWithProducts[product] = [i.$1];
-        } else {
-          listingsWithProducts[product]!.add(i.$1);
-        }
+      final product = await i.$2.product.getSingle();
+
+      if (!listingsWithProducts.containsKey(product)) {
+        listingsWithProducts[product] = [i.$1];
+      } else {
+        listingsWithProducts[product]!.add(i.$1);
       }
     }
     expect(listingsWithProducts.length, 9);

diff --git a/drift/test/manager/manager_selectable_test.dart b/drift/test/manager/manager_selectable_test.dart
@@ -36,9 +36,7 @@ void main() {
 
     final listings = await _listingsData.mapAsyncAndAwait(
       (p0) => db.managers.listing.createReturning((o) => o(
-          product: Value(p0.product),
-          store: Value(p0.store),
-          price: Value(p0.price))),
+          product: p0.product, store: Value(p0.store), price: Value(p0.price))),
     );
 
     final getAllStores = db.managers.store;

diff --git a/drift_dev/lib/src/writer/manager/manager_templates.dart b/drift_dev/lib/src/writer/manager/manager_templates.dart
@@ -642,7 +642,7 @@ class _ManagerCodeTemplates {
           return """
         $aliasedTableMethod
 
-        ${processedTableManagerTypedefName(relation.referencedTable)}? get ${relation.fieldName} {
+        ${processedTableManagerTypedefName(relation.referencedTable)}${relation.currentColumn.nullable ? "?" : ""} get ${relation.fieldName} {
           if (\$_item.${relation.currentColumn.nameInDart} == null) return null;
           final manager = ${rootTableManagerWithPrefix(relation.referencedTable, leaf)}(\$_db, \$_db.${relation.referencedTable.dbGetterName}).filter((f) => f.${relation.referencedColumn.nameInDart}(\$_item.${relation.currentColumn.nameInDart}!));
           final item = \$_typedResult.readTableOrNull(_${relation.fieldName}Table(\$_db));

diff --git a/examples/migrations_example/lib/database.g.dart b/examples/migrations_example/lib/database.g.dart