1.5.0 collected changes, part 2, e.g. objectbox-c-sync.h

Author: greenrobot

.gitignore

@@ -37,4 +37,10 @@ Carthage/Checkouts
 .idea/
 
 # ObjectBox model backups
-*.json.bak
+*.json.bak
+
+#DBs
+*.mdb
+
+# E.g. built frameworks
+*.zip

Source/fetch_dependencies.command

@@ -43,18 +43,25 @@ if [ -d "$code_dir" ]; then # Do we have an existing code repo?
     git_status=$(git status --porcelain)
     # ignore untracked uws submodule (left over when switching from a sync to a non-sync branch)
     git_status=${git_status#"?? objectbox/src/main/cpp/external/uws-objectbox/"}
+     # Note: doing a mini pause so the color state emoji can be perceived before scrolling it off the screen
     if [ -z "$git_status" ]; then
       git_clean=true
       if [ -f "${cache_zip}" ]; then
-        echo "ObjectBox core is clean and cache ZIP found for ${cache_key}. Extracting..."
+        echo "🟢 ObjectBox core is clean and cache ZIP found for ${cache_key}."
+        echo "📦 Extracting..."
+        sleep 0.5
         unzip -o "${cache_zip}" -d "${dest_dir}"
         do_build=false
       else
-        echo "ObjectBox core is clean but no cache ZIP found for ${cache_key}. Building..."
-      fi
+        echo "⚪ ObjectBox core is clean but no cache ZIP found for ${cache_key}."
+        echo "🏗️ Building..."
+        sleep 0.5
+    fi
     else
       git status
-      echo "ObjectBox core is not clean, won't use caching. Building..."
+      echo "🔴 ObjectBox core is not clean, won't use caching. 🏗️ Building..."
+      echo "🏗️ Building..."
+      sleep 0.5
     fi
     if [ "$do_build" = true ]; then
       "$code_dir/scripts/apple-build-static-libs.sh" $build_params "$dest_dir" release
@@ -95,7 +102,10 @@ fi
 fi # verify_only
 
 # Update the header file actually used by our Swift sources
-cp "$dest_dir/objectbox.h" "ios-framework/CommonSource/Internal/objectbox-c.h"
+c_header_dir="ios-framework/CommonSource/Internal"
+cp "$dest_dir/objectbox.h" "${c_header_dir}/objectbox-c.h"
+cp "$dest_dir/objectbox-sync.h" "${c_header_dir}/objectbox-c-sync.h"
+sed -i '' 's/#include "objectbox.h"/#include "objectbox-c.h"/' "${c_header_dir}/objectbox-c-sync.h"
 
 # Print versions for allow verification of built libs (is it the one we expect?)
 echo "============================================================================================"

Source/ios-framework/CodeGenTests/RunToolTests.sh

@@ -33,7 +33,7 @@ mkdir -p $MYOUTPUTDIR
 cd ${BUILT_PRODUCTS_DIR}
 
 test_target_num () {
-    FAIL=0
+    local FAIL=0  # yuck, FAIL is also a global var
 
     echo "note: ******************** $2: $1 ********************"
 
@@ -164,7 +164,7 @@ test_target_num () {
 }
 
 fail_codegen_target_num () {
-    FAIL=0
+    local FAIL=0  # yuck, FAIL is also a global var
 
     echo "note: ******************** $2: $1 ********************"
 
@@ -280,66 +280,66 @@ FAIL=0
 
 cd "${MYOUTPUTDIR}"
 
-test_target_num "Simple Model" 1 || FAIL=1
-test_target_num "Subclassed Model" 2 || FAIL=1
-test_target_num "Annotated minimal entity" 3 || FAIL=1
-test_target_num "Un-annotated minimal entity" 4 || FAIL=1
-test_target_num "Two IDs one annotated" 5 || FAIL=1
-fail_codegen_target_num "Two IDs both annotated" 6 || FAIL=1
-fail_codegen_target_num "Two IDs none annotated" 7 || FAIL=1
-fail_codegen_target_num "Empty Entity" 8 || FAIL=1
-test_target_num "ID and 2 strings entity" 9 || FAIL=1
-fail_codegen_target_num "NameInDb collision with other property" 10 || FAIL=1
-fail_codegen_target_num "Entity with string but no ID" 11 || FAIL=1
-test_target_num "Remove A Property" 12 || FAIL=1
-test_target_num "Remove A Property and add one at same time" 13 || FAIL=1
-test_target_num "Add a Property after having removed one" 14 || FAIL=1
-test_target_num "Remove an index from a property" 15 || FAIL=1
-test_target_num "Add and remove an index in one go" 16 || FAIL=1
-test_target_num "Add an index after having removed one" 17 || FAIL=1
-test_target_num "Rename an entity" 18 || FAIL=1
-fail_codegen_target_num "Entity UID printing" 19 || FAIL=1
-fail_codegen_target_num "New Entity with empty UID" 20 || FAIL=1
-test_target_num "Rename a property" 21 || FAIL=1
-fail_codegen_target_num "Property UID printing" 22 || FAIL=1
-fail_codegen_target_num "New Property with empty UID" 23 || FAIL=1
-fail_codegen_target_num "New Property with UID" 24 || FAIL=1
-test_target_num "Read/write all our data types" 25 || FAIL=1
-test_target_num "Ensure running codegen on unchanged file changes nothing" 26 || FAIL=1
-test_target_num "Ensure assigning a previously proposed UID works [Change/Reset]" 27 || FAIL=1
-test_target_num "Ensure moving properties changes nothing" 28 || FAIL=1
-test_target_num "Ensure moving entities changes nothing" 29 || FAIL=1
-test_target_num "Unique Entity Exception Test" 30 || FAIL=1
-test_target_num "Struct Entity Test" 31 || FAIL=1
-test_target_num "UInt64 as ID Test" 32 || FAIL=1
-test_target_num "Data and [UInt8] Test" 33 || FAIL=1
-
-test_target_num "Converter Test" 34 || FAIL=1
-test_target_num "Enum Test" 35 || FAIL=1
-test_target_num "Standalone Relations" 36 || FAIL=1
-test_target_num "Standalone Backlinks" 37 || FAIL=1
-test_target_num "Edit ToOne Backlinks" 38 || FAIL=1
-test_target_num "Edit ToOne Backlinks Structs" 39 || FAIL=1
-test_target_num "Standalone Backlinks Structs" 40 || FAIL=1
-fail_codegen_target_num "ToOne Backlink annotation wrong" 41 || FAIL=1
-test_target_num "Standalone Relation Queries" 42 || FAIL=1
-test_target_num "ToOne Relation Queries" 43 || FAIL=1
-test_target_num "many-to-many reset" 44 || FAIL=1
-test_target_num "many-to-many backlink reset" 45 || FAIL=1
-test_target_num "Threaded ToOne backlink edit" 46 || FAIL=1
-test_target_num "Threaded Many-to-many edit" 47 || FAIL=1
-test_target_num "Threaded Many-to-many backlink edit" 48 || FAIL=1
-test_target_num "Untyped IDs and queries 1" 49 || FAIL=1
-test_target_num "Untyped IDs and queries 2" 50 || FAIL=1
-#fail_codegen_target_num "Typed IDs still enforce type?" 51 || FAIL=1
-
-fail_codegen_target_num "Ensure we don't write JSON before ID errors" 52 || FAIL=1
-test_target_num "ToOne Backlink ensure applyToDb is needed" 53 || FAIL=1
-test_target_num "ToMany ensure applyToDb is needed" 54 || FAIL=1
-test_target_num "ToMany Backlink ensure applyToDb is needed" 55 || FAIL=1
-test_target_num "Swift Property Wrappers are treated as wrapped type" 56 || FAIL=1
-test_target_num "Optional Template Syntax recognized as optional" 57 || FAIL=1
-
-echo "note: Finished tests..."
+test_target_num "Simple Model" 1 || ((FAIL++))
+test_target_num "Subclassed Model" 2 || ((FAIL++))
+test_target_num "Annotated minimal entity" 3 || ((FAIL++))
+test_target_num "Un-annotated minimal entity" 4 || ((FAIL++))
+test_target_num "Two IDs one annotated" 5 || ((FAIL++))
+fail_codegen_target_num "Two IDs both annotated" 6 || ((FAIL++))
+fail_codegen_target_num "Two IDs none annotated" 7 || ((FAIL++))
+fail_codegen_target_num "Empty Entity" 8 || ((FAIL++))
+test_target_num "ID and 2 strings entity" 9 || ((FAIL++))
+fail_codegen_target_num "NameInDb collision with other property" 10 || ((FAIL++))
+fail_codegen_target_num "Entity with string but no ID" 11 || ((FAIL++))
+test_target_num "Remove A Property" 12 || ((FAIL++))
+test_target_num "Remove A Property and add one at same time" 13 || ((FAIL++))
+test_target_num "Add a Property after having removed one" 14 || ((FAIL++))
+test_target_num "Remove an index from a property" 15 || ((FAIL++))
+test_target_num "Add and remove an index in one go" 16 || ((FAIL++))
+test_target_num "Add an index after having removed one" 17 || ((FAIL++))
+test_target_num "Rename an entity" 18 || ((FAIL++))
+fail_codegen_target_num "Entity UID printing" 19 || ((FAIL++))
+fail_codegen_target_num "New Entity with empty UID" 20 || ((FAIL++))
+test_target_num "Rename a property" 21 || ((FAIL++))
+fail_codegen_target_num "Property UID printing" 22 || ((FAIL++))
+fail_codegen_target_num "New Property with empty UID" 23 || ((FAIL++))
+fail_codegen_target_num "New Property with UID" 24 || ((FAIL++))
+test_target_num "Read/write all our data types" 25 || ((FAIL++))
+test_target_num "Ensure running codegen on unchanged file changes nothing" 26 || ((FAIL++))
+test_target_num "Ensure assigning a previously proposed UID works [Change/Reset]" 27 || ((FAIL++))
+test_target_num "Ensure moving properties changes nothing" 28 || ((FAIL++))
+test_target_num "Ensure moving entities changes nothing" 29 || ((FAIL++))
+test_target_num "Unique Entity Exception Test" 30 || ((FAIL++))
+test_target_num "Struct Entity Test" 31 || ((FAIL++))
+test_target_num "UInt64 as ID Test" 32 || ((FAIL++))
+test_target_num "Data and [UInt8] Test" 33 || ((FAIL++))
+
+test_target_num "Converter Test" 34 || ((FAIL++))
+test_target_num "Enum Test" 35 || ((FAIL++))
+test_target_num "Standalone Relations" 36 || ((FAIL++))
+test_target_num "Standalone Backlinks" 37 || ((FAIL++))
+test_target_num "Edit ToOne Backlinks" 38 || ((FAIL++))
+test_target_num "Edit ToOne Backlinks Structs" 39 || ((FAIL++))
+test_target_num "Standalone Backlinks Structs" 40 || ((FAIL++))
+fail_codegen_target_num "ToOne Backlink annotation wrong" 41 || ((FAIL++))
+test_target_num "Standalone Relation Queries" 42 || ((FAIL++))
+test_target_num "ToOne Relation Queries" 43 || ((FAIL++))
+test_target_num "many-to-many reset" 44 || ((FAIL++))
+test_target_num "many-to-many backlink reset" 45 || ((FAIL++))
+test_target_num "Threaded ToOne backlink edit" 46 || ((FAIL++))
+test_target_num "Threaded Many-to-many edit" 47 || ((FAIL++))
+test_target_num "Threaded Many-to-many backlink edit" 48 || ((FAIL++))
+test_target_num "Untyped IDs and queries 1" 49 || ((FAIL++))
+test_target_num "Untyped IDs and queries 2" 50 || ((FAIL++))
+#fail_codegen_target_num "Typed IDs still enforce type?" 51 || ((FAIL++))
+
+fail_codegen_target_num "Ensure we don't write JSON before ID errors" 52 || ((FAIL++))
+test_target_num "ToOne Backlink ensure applyToDb is needed" 53 || ((FAIL++))
+test_target_num "ToMany ensure applyToDb is needed" 54 || ((FAIL++))
+test_target_num "ToMany Backlink ensure applyToDb is needed" 55 || ((FAIL++))
+test_target_num "Swift Property Wrappers are treated as wrapped type" 56 || ((FAIL++))
+test_target_num "Optional Template Syntax recognized as optional" 57 || ((FAIL++))
+
+echo "note: Finished tests with $FAIL failures"
 
 exit $FAIL

Source/ios-framework/CommonSource/Internal/ObjectBox.h

@@ -1,5 +1,5 @@
 //
-// Copyright © 2019 ObjectBox Ltd. All rights reserved.
+// Copyright © 2019-2021 ObjectBox Ltd. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,3 +17,4 @@
 
 #import "obx_fbb.h"
 #import "objectbox-c.h"
+#import "objectbox-c-sync.h"