misc fixes

Author: frank06

example/lib/main.dart

@@ -19,7 +19,6 @@ void main() async {
         localStorageProvider.overrideWith(
           (ref) => LocalStorage(
             baseDirFn: () => _dir.path,
-            encryptionKey: 'blah',
             clear: LocalStorageClearStrategy.always,
           ),
         ),
@@ -39,7 +38,7 @@ void main() async {
     final user2 = container.users.findOneLocalById(1);
 
     assert(user.name == user2!.name);
-    print(user.tasks.length); // TODO fix
+    assert(user.tasks.length == 3);
   } finally {
     await container.read(localStorageProvider).destroy();
   }

example/lib/main.data.dart

@@ -13,6 +13,7 @@ class Task extends DataModel<Task> {
   final int? id;
   final String title;
   final bool completed;
+  @JsonKey(name: 'userId')
   final BelongsTo<User>? user;
 
   Task({this.id, required this.title, this.completed = false, this.user});

example/lib/models/task.dart

@@ -498,7 +498,6 @@ mixin _RemoteAdapter<T extends DataModelMixin<T>> on _SerializationAdapter<T> {
         return label.model as R?;
       }
 
-      print('1');
       final data = await deserialize(body as Map<String, dynamic>,
           key: label.model!._key);
       final model = data.model!;
@@ -507,7 +506,6 @@ mixin _RemoteAdapter<T extends DataModelMixin<T>> on _SerializationAdapter<T> {
       if (model._key != label.model!._key) {
         deleteLocalByKeys({label.model!._key!});
       }
-      print('2');
       model.saveLocal();
 
       log(label, 'saved in local storage and remote');
@@ -532,7 +530,6 @@ mixin _RemoteAdapter<T extends DataModelMixin<T>> on _SerializationAdapter<T> {
       return response.body as R?;
     }
 
-    // TODO test: not properly deserializing findAll with relationship references (see example app)
     final deserialized = await deserialize(body);
 
     if (isFindAll || (isCustom && deserialized.model == null)) {
@@ -584,10 +581,7 @@ mixin _RemoteAdapter<T extends DataModelMixin<T>> on _SerializationAdapter<T> {
   Future<void> _saveDeserialized(DeserializedData deserialized) async {
     final models = [...deserialized.models, ...deserialized.included];
     if (models.isEmpty) return;
-    await logTimeAsync('[_saveDeserialized] writing ${models.length} models',
-        () async {
-      await saveManyLocal(models.cast());
-    });
+    await saveManyLocal(models.cast());
   }
 
   /// Returns URL for [findAll]. Defaults to [type].

example/lib/models/task.g.dart

@@ -24,15 +24,6 @@ mixin _SerializationAdapter<T extends DataModelMixin<T>> on _BaseAdapter<T> {
     return map;
   }
 
-  // Future<DeserializedData<T>> deserialize(Object? data,
-  //     {String? key, async = true}) async {
-  //   final z = await runInIsolate((container) async {
-
-  //     return <DataModelMixin>[];
-  //   });
-  //   return DeserializedData([]);
-  // }
-
   (List<DataModelMixin>, List<DataModelMixin>) _deserialize(
       Adapter adapter, Object? data,
       {String? key}) {
@@ -78,9 +69,9 @@ mixin _SerializationAdapter<T extends DataModelMixin<T>> on _BaseAdapter<T> {
             }
 
             if (metadata.kind == 'BelongsTo') {
-              // NOTE: when _process was async, a sqlite bug
-              // appears when awaiting it (db turns to inMemory and closed)
-              // and leaving everything sync works for now
+              // NOTE: when _processIdAndAddInclude was async, a sqlite bug
+              // appeared when awaiting it (db turns to inMemory and closed)
+              // so leaving everything sync works for now
               final key = _processIdAndAddInclude(mapIn[mapKey], relType);
               if (key != null) mapOut[mapKey] = key;
             }

lib/src/adapter/remote_adapter.dart

@@ -99,7 +99,7 @@ sealed class Relationship<E extends DataModelMixin<E>, N> with EquatableMixin {
 
     if (order == -1) {
       db.execute(
-          'UPDATE _edges SET dest = ? WHERE key_ = ? AND name_ = ? AND _key = ?',
+          'UPDATE _edges SET _key = ? WHERE key_ = ? AND name_ = ? AND _key = ?',
           args);
     } else {
       db.execute(

lib/src/adapter/serialization_adapter.dart

@@ -3,13 +3,11 @@ part of flutter_data;
 class LocalStorage {
   LocalStorage({
     required this.baseDirFn,
-    this.encryptionKey,
     LocalStorageClearStrategy? clear,
   }) : clear = clear ?? LocalStorageClearStrategy.never;
 
   var isInitialized = false;
 
-  final String? encryptionKey;
   final FutureOr<String> Function() baseDirFn;
   final LocalStorageClearStrategy clear;
 

lib/src/model/relationship/relationship.dart

@@ -65,9 +65,7 @@ void main() async {
       familias.add(familia);
     }
 
-    await logTimeAsync('bulk save', () async {
-      await container.familia.saveManyLocal(familias);
-    });
+    await container.familia.saveManyLocal(familias);
 
     expect(container.familia.countLocal, length);
   });