Throws last core error when beginWriteAsync and commitWriteAsync

lib/src/native/realm_core.dart

@@ -98,13 +98,17 @@ class _RealmCore {
  return LastError(error.ref.error, message, userError);
  }
 
+ bool clearLastError() {
+ return _realmLib.realm_clear_last_error();
+ }
+
  void throwLastError([String? errorMessage]) {
  using((Arena arena) {
  final lastError = getLastError(arena);
+ if (errorMessage == null && lastError == null) return;
  if (lastError?.userError != null) {
  throw UserCallbackException(lastError!.userError!);
  }
-
  throw RealmException('${errorMessage != null ? "$errorMessage. " : ""}${lastError ?? ""}');
  });
  }
@@ -586,8 +590,8 @@ class _RealmCore {
  Future<void> beginWriteAsync(Realm realm, CancellationToken? ct) {
  final completer = WriteCompleter(realm, ct);
  if (!completer.isCancelled) {
- completer.id = _realmLib.realm_async_begin_write(realm.handle._pointer, Pointer.fromFunction(_completeAsyncBeginWrite), completer.toPersistentHandle(),
- _realmLib.addresses.realm_dart_delete_persistent_handle, true);
+ _realmLib.invokeGetInt(() => completer.id = _realmLib.realm_async_begin_write(realm.handle._pointer, Pointer.fromFunction(_completeAsyncBeginWrite),
+ completer.toPersistentHandle(), _realmLib.addresses.realm_dart_delete_persistent_handle, true));
  }
 
  return completer.future;
@@ -596,8 +600,8 @@ class _RealmCore {
  Future<void> commitWriteAsync(Realm realm, CancellationToken? ct) {
  final completer = WriteCompleter(realm, ct);
  if (!completer.isCancelled) {
- completer.id = _realmLib.realm_async_commit(realm.handle._pointer, Pointer.fromFunction(_completeAsyncCommit), completer.toPersistentHandle(),
- _realmLib.addresses.realm_dart_delete_persistent_handle, false);
+ _realmLib.invokeGetInt(() => completer.id = _realmLib.realm_async_commit(realm.handle._pointer, Pointer.fromFunction(_completeAsyncCommit),
+ completer.toPersistentHandle(), _realmLib.addresses.realm_dart_delete_persistent_handle, false));
  }
 
  return completer.future;
@@ -1848,7 +1852,7 @@ class _RealmCore {
  return;
  }
  if (errorCode != nullptr) {
-  // Throw RealmException instead of RealmError to be recoverable by the user.
+ // Throw RealmException instead of RealmError to be recoverable by the user.
  completer.completeError(RealmException(errorCode.toSyncError().toString()));
  } else {
  completer.complete();
@@ -2378,6 +2382,12 @@ extension _RealmLibraryEx on RealmLibrary {
  }
  return result;
  }
+
+ void invokeGetInt(int Function() callback, [String? errorMessage]) {
+ realmCore.clearLastError();
+ callback();
+ realmCore.throwLastError(errorMessage); 
+ }
 }
 
 Pointer<realm_value_t> _toRealmValue(Object? value, Allocator allocator) {

lib/src/realm_class.dart

@@ -303,8 +303,6 @@ class Realm implements Finalizable {
 
  /// Begins a write transaction for this [Realm].
  Transaction beginWrite() {
- _ensureWritable();
-
  realmCore.beginWrite(this);
 
  return Transaction._(this);
@@ -313,8 +311,6 @@ class Realm implements Finalizable {
  /// Asynchronously begins a write transaction for this [Realm]. You can supply a
  /// [CancellationToken] to cancel the operation.
  Future<Transaction> beginWriteAsync([CancellationToken? cancellationToken]) async {
- _ensureWritable();
-
  await realmCore.beginWriteAsync(this, cancellationToken);
 
  return Transaction._(this);
@@ -474,12 +470,6 @@ class Realm implements Finalizable {
  throw RealmError('Cannot $operation because the object is managed by another Realm instance');
  }
  }
-
- void _ensureWritable() {
- if (isFrozen) {
- throw RealmError('Starting a write transaction on a frozen Realm is not allowed.');
- }
- }
 }
 
 /// Provides a scope to safely write data to a [Realm]. Can be created using [Realm.beginWrite] or

test/configuration_test.dart

@@ -173,14 +173,15 @@ Future<void> main([List<String>? args]) async {
  expect(cars.length, 1);
  });
 
- test('Configuration readOnly - writing on read-only Realms throws', () {
+ test('Configuration readOnly - writing on read-only Realms throws', () async {
  Configuration config = Configuration.local([Car.schema]);
  var realm = getRealm(config);
  realm.close();
 
  config = Configuration.local([Car.schema], isReadOnly: true);
  realm = getRealm(config);
- expect(() => realm.write(() {}), throws<RealmException>("Can't perform transactions on read-only Realms."));
+ realm.writesExpectException<RealmException>("Can't perform transactions on read-only Realms.");
+ await realm.asyncWritesExpectException<RealmException>("Can't perform transactions on read-only Realms.");
  });
 
  test('Configuration inMemory - no files after closing realm', () {

test/realm_test.dart

@@ -266,14 +266,15 @@ Future<void> main([List<String>? args]) async {
  expect(realm.write(() => realm.add(carTwo, update: true)), carTwo);
  });
 
- test('Realm write after realm is closed', () {
+ test('Realm write after realm is closed', () async {
  var config = Configuration.local([Car.schema]);
  var realm = getRealm(config);
 
  final car = Car('Tesla');
 
  realm.close();
- expect(() => realm.write(() {}), throws<RealmClosedError>("Cannot access realm that has been closed"));
+ realm.writesExpectException<RealmClosedError>("Cannot access realm that has been closed");
+ await realm.asyncWritesExpectException<RealmClosedError>("Cannot access realm that has been closed");
  });
 
  test('Realm query', () {
@@ -574,12 +575,12 @@ Future<void> main([List<String>? args]) async {
  expect(returnedCar, car);
  });
 
- test('Realm write inside another write throws', () {
+ test('Realm write inside another write throws', () async {
  final config = Configuration.local([Car.schema]);
  final realm = getRealm(config);
- realm.write(() {
+ realm.write(() async {
  // Second write inside the first one fails but the error is caught
- expect(() => realm.write(() {}), throws<RealmException>('The Realm is already in a write transaction'));
+ realm.writesExpectException<RealmException>("The Realm is already in a write transaction");
  });
  });
 
@@ -717,36 +718,13 @@ Future<void> main([List<String>? args]) async {
  expect(realm.all<Person>().length, 0);
  });
 
- test('FrozenRealm cannot write', () {
- final config = Configuration.local([Person.schema]);
- final realm = getRealm(config);
-
- final frozenRealm = freezeRealm(realm);
- expect(() => frozenRealm.write(() {}), throws<RealmError>("Starting a write transaction on a frozen Realm is not allowed."));
- });
-
- test('FrozenRealm cannot beginWrite', () {
+ test('FrozenRealm cannot write', () async {
  final config = Configuration.local([Person.schema]);
  final realm = getRealm(config);
 
  final frozenRealm = freezeRealm(realm);
- expect(() => frozenRealm.beginWrite(), throws<RealmError>("Starting a write transaction on a frozen Realm is not allowed."));
- });
-
- test('FrozenRealm cannot writeAsync', () async {
- final config = Configuration.local([Person.schema]);
- final realm = getRealm(config);
-
- final frozenRealm = freezeRealm(realm);
- await expectLater(() => frozenRealm.writeAsync(() {}), throws<RealmError>("Starting a write transaction on a frozen Realm is not allowed."));
- });
-
- test('FrozenRealm cannot beginWriteAsync', () async {
- final config = Configuration.local([Person.schema]);
- final realm = getRealm(config);
-
- final frozenRealm = freezeRealm(realm);
- await expectLater(() => frozenRealm.beginWriteAsync(), throws<RealmError>("Starting a write transaction on a frozen Realm is not allowed."));
+ frozenRealm.writesExpectException<RealmException>("Can't perform transactions on a frozen Realm");
+ await frozenRealm.asyncWritesExpectException<RealmException>("Can't perform transactions on a frozen Realm");
  });
 
  test('realm.freeze when frozen returns the same instance', () {
@@ -1016,7 +994,6 @@ Future<void> main([List<String>? args]) async {
  test('Realm.beginWriteAsync starts write transaction', () async {
  final realm = getRealm(Configuration.local([Person.schema]));
  final transaction = await realm.beginWriteAsync();
-
  expect(transaction.isOpen, true);
  });
 
@@ -1025,7 +1002,6 @@ Future<void> main([List<String>? args]) async {
  final transaction = await realm.beginWriteAsync();
  realm.add(Person('John'));
  transaction.commit();
-
  expect(realm.all<Person>().length, 1);
  });
 
@@ -1034,7 +1010,6 @@ Future<void> main([List<String>? args]) async {
  final transaction = await realm.beginWriteAsync();
  realm.add(Person('John'));
  await transaction.commitAsync();
-
  expect(realm.all<Person>().length, 1);
  });
 
@@ -1052,7 +1027,6 @@ Future<void> main([List<String>? args]) async {
  final transaction = realm.beginWrite();
  realm.add(Person('John'));
  await transaction.commitAsync();
-
  expect(realm.all<Person>().length, 1);
  });
 

test/test.dart

@@ -590,3 +590,15 @@ Future<void> _printPlatformInfo() async {
 
  print('Current PID $pid; OS $os, $pointerSize bit, CPU ${cpu ?? 'unknown'}');
 }
+
+extension $WriteExtension on Realm {
+ void writesExpectException<TException>(String exceptionMessage) {
+ expect(() => write(() {}), throws<TException>(exceptionMessage));
+ expect(() => beginWrite(), throws<TException>(exceptionMessage));
+ }
+
+ Future<void> asyncWritesExpectException<TException>(String exceptionMessage) async {
+ await expectLater(() => writeAsync(() {}), throws<TException>(exceptionMessage));
+ await expectLater(() => beginWriteAsync(), throws<TException>(exceptionMessage));
+ }
+}