Skip to content

Commit 83bc0e4

Browse files
committed
Merge branch 'main' into async-and-isolates
# Conflicts: # lib/src/bindings/bindings.dart # lib/src/bindings/objectbox-c.dart # lib/src/observable.dart # lib/src/sync.dart # pubspec.yaml # test/observer_test.dart
2 parents 24ea8d0 + 80b0bf5 commit 83bc0e4

18 files changed

+2331
-2388
lines changed

generator/lib/src/code_builder.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@ class CodeBuilder extends Builder {
159159
}
160160

161161
relInModel.name = rel.name;
162-
relInModel.targetId = entityInModel.model.findEntityByName(rel.targetName).id;
162+
relInModel.targetId =
163+
entityInModel.model.findEntityByName(rel.targetName).id;
163164
}
164165

165166
IdUid mergeEntity(ModelInfo modelInfo, ModelEntity entity) {

lib/integration_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ class IntegrationTest {
2929
modelInfo.validate();
3030

3131
final model = Model(modelInfo);
32-
checkObx(bindings.obx_model_free(model.ptr));
32+
checkObx(C.model_free(model.ptr));
3333
}
3434
}

lib/src/bindings/bindings.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ObjectBoxC loadObjectBoxLib() {
3434

3535
ObjectBoxC /*?*/ _cachedBindings;
3636

37-
ObjectBoxC get bindings => _cachedBindings ??= loadObjectBoxLib();
37+
ObjectBoxC get C => _cachedBindings ??= loadObjectBoxLib();
3838

3939
/// Init DartAPI in C for async callbacks.
4040
///
@@ -43,7 +43,7 @@ ObjectBoxC get bindings => _cachedBindings ??= loadObjectBoxLib();
4343
/// See https://github.com/objectbox/objectbox-dart/issues/143
4444
void initializeDartAPI() {
4545
if (_dartAPIinitialized == null) {
46-
final errCode = bindings.obx_dart_init_api(NativeApi.initializeApiDLData);
46+
final errCode = C.dartc_init_api(NativeApi.initializeApiDLData);
4747
_dartAPIinitialized = (OBX_SUCCESS == errCode);
4848
if (!_dartAPIinitialized) {
4949
_dartAPIinitException = latestNativeError(codeIfMissing: errCode);

lib/src/bindings/helpers.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ Pointer<T> checkObxPtr<T extends NativeType>(Pointer<T> /*?*/ ptr,
3030

3131
ObjectBoxException latestNativeError(
3232
{String /*?*/ dartMsg, int codeIfMissing = OBX_ERROR_UNKNOWN}) {
33-
final code = bindings.obx_last_error_code();
34-
final text = cString(bindings.obx_last_error_message());
33+
final code = C.last_error_code();
34+
final text = cString(C.last_error_message());
3535

3636
if (code == 0 && text.isEmpty) {
3737
return ObjectBoxException(
@@ -120,8 +120,8 @@ class CursorHelper {
120120
Pointer<IntPtr> sizePtr;
121121

122122
CursorHelper(Pointer<OBX_txn> txn, EntityDefinition entity, bool isWrite)
123-
: ptr = checkObxPtr(bindings.obx_cursor(txn, entity.model.id.id),
124-
'failed to create cursor') {
123+
: ptr = checkObxPtr(
124+
C.cursor(txn, entity.model.id.id), 'failed to create cursor') {
125125
if (!isWrite) {
126126
dataPtrPtr = allocate<Pointer<Void>>();
127127
sizePtr = allocate<IntPtr>();
@@ -134,6 +134,6 @@ class CursorHelper {
134134
void close() {
135135
if (dataPtrPtr != null) free(dataPtrPtr);
136136
if (sizePtr != null) free(sizePtr);
137-
checkObx(bindings.obx_cursor_close(ptr));
137+
checkObx(C.cursor_close(ptr));
138138
}
139139
}

0 commit comments

Comments
 (0)