RCPP-46 fix type safe queries

CHANGELOG.md

@@ -3,6 +3,7 @@ X.Y.Z Release notes (YYYY-MM-DD)
 
 ### Fixed
 * Managed objects would exhibit undefined behaviour when returned from the subscript operator in `std::vector` & `std::map`.
+* Type safe queries would not work correctly when link properties were used.
 
 ### Enhancements
 * Add `realm::holds_alternative` which acts as a substitute to `std::holds_alternative` when using `managed<realm::mixed>`.
@@ -18,7 +19,7 @@ X.Y.Z Release notes (YYYY-MM-DD)
 * Fileformat: Generates files with format v23. Reads and automatically upgrade from fileformat v5.
 
 ### Internals
-* None
+* Upgraded to Core v14.1.0
 
 ----------------------------------------------
 
@@ -313,4 +314,4 @@ The following functions now return `std::future` instead of `std::promise`
 ### Internals
 * Upgraded to Core v13.9.2
 
-----------------------------------------------
+----------------------------------------------

Package.swift

@@ -3,7 +3,7 @@
 import PackageDescription
 
 let sdkVersion = Version("1.0.0")
-let coreVersion = Version("13.26.0")
+let coreVersion = Version("14.1.0")
 
 var cxxSettings: [CXXSetting] = [
     .define("REALM_ENABLE_SYNC", to: "1"),
@@ -61,7 +61,7 @@ let package = Package(
             targets: ["realm-cpp-sdk"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/realm/realm-core.git", revision: "334d534a49b39d70f1b2ae5d982272e30f74dd82")
+        .package(url: "https://github.com/realm/realm-core.git", revision: "08c61e87add15b0d7fcd52c818c43fb4804e1216")
     ],
     targets: [
         cppSdkTarget,
@@ -97,6 +97,25 @@ let package = Package(
             sources: [
                 "main.hpp",
                 "main.cpp",
+                "db/binary_tests.cpp",
+                "db/date_tests.cpp",
+                "db/decimal_tests.cpp",
+                "db/embedded_object_tests.cpp",
+                "db/frozen_tests.cpp",
+                "db/list_tests.cpp",
+                "db/map_tests.cpp",
+                "db/mixed_tests.cpp",
+                "db/numeric_tests.cpp",
+                "db/object_id_tests.cpp",
+                "db/object_tests.cpp",
+                "db/optional_tests.cpp",
+                "db/performance_tests.cpp",
+                "db/query_tests.cpp",
+                "db/realm_tests.cpp",
+                "db/results_tests.cpp",
+                "db/run_loop_tests.cpp",
+                "db/set_tests.cpp",
+                "db/string_tests.cpp"
             ],
             resources: [
                 .copy("setup_baas.rb"),

ports/portfile.cmake

@@ -8,7 +8,7 @@ vcpkg_execute_required_process(
   LOGNAME submodules
 )
 
-set(CPPREALM_CMAKE_OPTIONS -DREALM_CPP_NO_TESTS=ON)
+set(CPPREALM_CMAKE_OPTIONS -DREALM_CPP_NO_TESTS=ON -DREALM_CORE_SUBMODULE_BUILD=OFF)
 
 if (ANDROID OR WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
     list(APPEND CPPREALM_CMAKE_OPTIONS -DREALM_USE_SYSTEM_OPENSSL=ON)

src/cpprealm/flex_sync.hpp

@@ -90,14 +90,15 @@ namespace realm {
             auto schema = m_realm.get().schema().find(managed<T>::schema.name);
             auto group = m_realm.get().read_group();
             auto table_ref = group.get_table(schema.table_key());
-            auto builder = internal::bridge::query(table_ref);
+            auto root_query = internal::bridge::query(table_ref);
 
             if (query_fn) {
-                auto q = realm::query<managed<T>>(builder, std::move(schema), m_realm);
-                auto full_query = (*query_fn)(q).q;
+                rbool query = rbool(std::move(root_query));
+                auto query_object = managed<T>::prepare_for_query(m_realm, &query);
+                auto full_query = (*query_fn)(query_object).q;
                 insert_or_assign(name, full_query);
             } else {
-                insert_or_assign(name, builder);
+                insert_or_assign(name, root_query);
             }
         }
 

src/cpprealm/internal/bridge/mixed.cpp

@@ -24,10 +24,12 @@ namespace realm::internal::bridge {
     }
 
     mixed::mixed(const mixed& other) {
-        if (other.type() == data_type::String) {
-            m_owned_string = other.m_owned_string;
-        } else if (other.type() == data_type::Binary) {
-            m_owned_data = other.m_owned_data;
+        if (!other.is_null()) {
+            if (other.type() == data_type::String) {
+                m_owned_string = other.m_owned_string;
+            } else if (other.type() == data_type::Binary) {
+                m_owned_data = other.m_owned_data;
+            }
         }
 
 #ifdef CPPREALM_HAVE_GENERATED_BRIDGE_TYPES
@@ -39,10 +41,12 @@ namespace realm::internal::bridge {
 
     mixed& mixed::operator=(const mixed& other) {
         if (this != &other) {
-            if (other.type() == data_type::String) {
-                m_owned_string = other.m_owned_string;
-            } else if (other.type() == data_type::Binary) {
-                m_owned_data = other.m_owned_data;
+            if (!other.is_null()) {
+                if (other.type() == data_type::String) {
+                    m_owned_string = other.m_owned_string;
+                } else if (other.type() == data_type::Binary) {
+                    m_owned_data = other.m_owned_data;
+                }
             }
 #ifdef CPPREALM_HAVE_GENERATED_BRIDGE_TYPES
             *reinterpret_cast<Mixed*>(&m_mixed) = *reinterpret_cast<const Mixed*>(&other.m_mixed);