Update to Realm Core 13.19.1 (#1493)

cmelchior · web-flow · commit 2ce9a278a11a · 2023-09-01T11:18:07.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -47,7 +47,7 @@ if the content is the same. Custom implementations of these methods will be resp
 * Minimum Android SDK: 16.
 
 ### Internal
-* Updated to Realm Core 13.19.0, commit ea7c5d5e2900b8411a295aea3d1aa56aa55fff1d.
+* Updated to Realm Core 13.19.1, commit c258e2681bca5fb33bbd23c112493817b43bfa86.
 
 
 ## 1.10.2 (2023-07-21)
diff --git a/packages/cinterop/src/commonMain/kotlin/io/realm/kotlin/internal/interop/ErrorCode.kt b/packages/cinterop/src/commonMain/kotlin/io/realm/kotlin/internal/interop/ErrorCode.kt
@@ -57,6 +57,7 @@ expect enum class ErrorCode : CodeDescription {
     RLM_ERR_SYNC_CLIENT_RESET_REQUIRED,
     RLM_ERR_SYNC_COMPENSATING_WRITE,
     RLM_ERR_SYNC_CONNECT_FAILED,
+    RLM_ERR_SYNC_CONNECT_TIMEOUT,
     RLM_ERR_SYNC_INVALID_SCHEMA_CHANGE,
     RLM_ERR_SYNC_PERMISSION_DENIED,
     RLM_ERR_SYNC_PROTOCOL_INVARIANT_FAILED,
diff --git a/packages/cinterop/src/jvm/kotlin/io/realm/kotlin/internal/interop/ErrorCode.kt b/packages/cinterop/src/jvm/kotlin/io/realm/kotlin/internal/interop/ErrorCode.kt
@@ -54,6 +54,7 @@ actual enum class ErrorCode(override val description: String, override val nativ
     RLM_ERR_SYNC_CLIENT_RESET_REQUIRED("SyncClientResetRequired", realm_errno_e.RLM_ERR_SYNC_CLIENT_RESET_REQUIRED),
     RLM_ERR_SYNC_COMPENSATING_WRITE("CompensatingWrite", realm_errno_e.RLM_ERR_SYNC_COMPENSATING_WRITE),
     RLM_ERR_SYNC_CONNECT_FAILED("SyncConnectFailed", realm_errno_e.RLM_ERR_SYNC_CONNECT_FAILED),
+    RLM_ERR_SYNC_CONNECT_TIMEOUT("SyncConnectTimeout", realm_errno_e.RLM_ERR_SYNC_CONNECT_TIMEOUT),
     RLM_ERR_SYNC_INVALID_SCHEMA_CHANGE("SyncInvalidSchemaChange", realm_errno_e.RLM_ERR_SYNC_INVALID_SCHEMA_CHANGE),
     RLM_ERR_SYNC_PERMISSION_DENIED("SyncPermissionDenied", realm_errno_e.RLM_ERR_SYNC_PERMISSION_DENIED),
     RLM_ERR_SYNC_PROTOCOL_INVARIANT_FAILED("SyncProtocolInvariantFailed", realm_errno_e.RLM_ERR_SYNC_PROTOCOL_INVARIANT_FAILED),
diff --git a/packages/cinterop/src/nativeDarwin/kotlin/io/realm/kotlin/internal/interop/ErrorCode.kt b/packages/cinterop/src/nativeDarwin/kotlin/io/realm/kotlin/internal/interop/ErrorCode.kt
@@ -58,6 +58,7 @@ actual enum class ErrorCode(
     RLM_ERR_SYNC_CLIENT_RESET_REQUIRED("SyncClientResetRequired", realm_errno.RLM_ERR_SYNC_CLIENT_RESET_REQUIRED),
     RLM_ERR_SYNC_COMPENSATING_WRITE("CompensatingWrite", realm_errno.RLM_ERR_SYNC_COMPENSATING_WRITE),
     RLM_ERR_SYNC_CONNECT_FAILED("SyncConnectFailed", realm_errno.RLM_ERR_SYNC_CONNECT_FAILED),
+    RLM_ERR_SYNC_CONNECT_TIMEOUT("SyncConnectTimeout", realm_errno.RLM_ERR_SYNC_CONNECT_TIMEOUT),
     RLM_ERR_SYNC_INVALID_SCHEMA_CHANGE("SyncInvalidSchemaChange", realm_errno.RLM_ERR_SYNC_INVALID_SCHEMA_CHANGE),
     RLM_ERR_SYNC_PERMISSION_DENIED("SyncPermissionDenied", realm_errno.RLM_ERR_SYNC_PERMISSION_DENIED),
     RLM_ERR_SYNC_PROTOCOL_INVARIANT_FAILED("SyncProtocolInvariantFailed", realm_errno.RLM_ERR_SYNC_PROTOCOL_INVARIANT_FAILED),
diff --git a/packages/external/core b/packages/external/core
@@ -1 +1 @@
-Subproject commit ea7c5d5e2900b8411a295aea3d1aa56aa55fff1d
+Subproject commit c258e2681bca5fb33bbd23c112493817b43bfa86
diff --git a/packages/library-base/src/commonMain/kotlin/io/realm/kotlin/internal/Converters.kt b/packages/library-base/src/commonMain/kotlin/io/realm/kotlin/internal/Converters.kt
@@ -17,6 +17,7 @@
 package io.realm.kotlin.internal
 
 import io.realm.kotlin.UpdatePolicy
+import io.realm.kotlin.annotations.ExperimentalGeoSpatialApi
 import io.realm.kotlin.dynamic.DynamicMutableRealmObject
 import io.realm.kotlin.dynamic.DynamicRealmObject
 import io.realm.kotlin.ext.asRealmObject
@@ -36,6 +37,9 @@ import io.realm.kotlin.types.RealmAny
 import io.realm.kotlin.types.RealmInstant
 import io.realm.kotlin.types.RealmObject
 import io.realm.kotlin.types.RealmUUID
+import io.realm.kotlin.types.geo.GeoBox
+import io.realm.kotlin.types.geo.GeoCircle
+import io.realm.kotlin.types.geo.GeoPolygon
 import org.mongodb.kbson.BsonObjectId
 import org.mongodb.kbson.Decimal128
 import kotlin.native.concurrent.SharedImmutable
@@ -352,6 +356,7 @@ internal object RealmValueArgumentConverter {
         } ?: nullTransport()
     }
 
+    @OptIn(ExperimentalGeoSpatialApi::class)
     fun MemTrackingAllocator.convertQueryArg(value: Any?): RealmQueryArgument =
         when (value) {
             is Collection<*> -> {
@@ -374,6 +379,13 @@ internal object RealmValueArgumentConverter {
                     }
                 )
             }
+            is GeoBox,
+            is GeoCircle,
+            is GeoPolygon -> {
+                // Hack support for geospatial arguments until we have propert C-API support.
+                // See https://github.com/realm/realm-core/pull/6934
+                RealmQuerySingleArgument(kAnyToRealmValue(value.toString()))
+            }
             else -> {
                 RealmQuerySingleArgument(kAnyToRealmValue(value))
             }
diff --git a/packages/library-base/src/commonMain/kotlin/io/realm/kotlin/types/geo/GeoBox.kt b/packages/library-base/src/commonMain/kotlin/io/realm/kotlin/types/geo/GeoBox.kt
@@ -28,7 +28,7 @@ import io.realm.kotlin.internal.geo.UnmanagedGeoBox
  * val bottomLeft = GeoPoint.create(latitude = 5.0, longitude = 5.0)
  * val topRight = GeoPoint.create(latitude = 10.0, longitude = 10.0)
  * val searchArea = GeoBox.create(bottomLeft, topRight)
- * val restaurants = realm.query<Restaurant>("location GEOWITHIN $searchArea").find()
+ * val restaurants = realm.query<Restaurant>("location GEOWITHIN $0", searchArea).find()
  * ```
  */
 @ExperimentalGeoSpatialApi
diff --git a/packages/library-base/src/commonMain/kotlin/io/realm/kotlin/types/geo/GeoCircle.kt b/packages/library-base/src/commonMain/kotlin/io/realm/kotlin/types/geo/GeoCircle.kt
@@ -26,7 +26,7 @@ import io.realm.kotlin.internal.geo.UnmanagedGeoCircle
  * ```
  * val newYork = GeoPoint.create(latitude = 40.730610, longitude = -73.935242)
  * val searchArea = GeoCircle.create(center = newYork, radius = Distance.fromMiles(2.0))
- * val restaurants = realm.query<Restaurant>("location GEOWITHIN $searchArea").find()
+ * val restaurants = realm.query<Restaurant>("location GEOWITHIN $0", searchArea).find()
  * ```
  */
 @ExperimentalGeoSpatialApi
@@ -47,6 +47,7 @@ public interface GeoCircle {
      * ```
      * val circle = GeoCircle.create(center = GeoPoint.create(0.0, 0.0), radius = Distance.fromKilometers(10.0))
      * val results = realm.query<Restaurant>("location GEOWITHIN $circle").find()
+     * ```
      */
     public override fun toString(): String
 
diff --git a/packages/library-base/src/commonMain/kotlin/io/realm/kotlin/types/geo/GeoPoint.kt b/packages/library-base/src/commonMain/kotlin/io/realm/kotlin/types/geo/GeoPoint.kt
@@ -88,7 +88,7 @@ import io.realm.kotlin.internal.geo.UnmanagedGeoPoint
  *
  * val newYork = GeoPoint.create(latitude = 40.730610, longitude = -73.935242)
  * val searchArea = GeoCircle.create(center = newYork, radius = Distance.fromMiles(2.0))
- * val restaurants = realm.query<Restaurant>("location GEOWITHIN $searchArea").find()
+ * val restaurants = realm.query<Restaurant>("location GEOWITHIN $0", searchArea).find()
  * ```
  *
  * A proper persistable GeoPoint class will be implemented in an upcoming release.
diff --git a/packages/library-base/src/commonMain/kotlin/io/realm/kotlin/types/geo/GeoPolygon.kt b/packages/library-base/src/commonMain/kotlin/io/realm/kotlin/types/geo/GeoPolygon.kt
@@ -60,7 +60,7 @@ import io.realm.kotlin.internal.geo.UnmanagedGeoPolygon
  *         GeoPoint.create(4.0, 1.0)
  *     ))
  * )
- * val restaurants = realm.query<Restaurant>("location GEOWITHIN $searchArea").find()
+ * val restaurants = realm.query<Restaurant>("location GEOWITHIN $0", searchArea).find()
  * * ```
  */
 @ExperimentalGeoSpatialApi
@@ -88,7 +88,8 @@ public interface GeoPolygon {
      *     GeoPoint.create(0.0, 0.0)
      * )
      * val searchArea = GeoPolygon.create(outerRing)
-     * val results = realm.query<Restaurant>("location GEOWITHIN searchArea").find()
+     * val results = realm.query<Restaurant>("location GEOWITHIN $searchArea").find()
+     * ```
      */
     override fun toString(): String
 
diff --git a/packages/test-base/src/commonTest/kotlin/io/realm/kotlin/test/common/GeoSpatialTests.kt b/packages/test-base/src/commonTest/kotlin/io/realm/kotlin/test/common/GeoSpatialTests.kt
@@ -520,4 +520,75 @@ class GeoSpatialTests {
             }
         }
     }
+
+    // Verify that geo objects can be passed directly as query arguments
+    // Kotlin will do implicit conversion to strings until native type support is added
+    @Test
+    fun asQueryArguments() {
+        realm.writeBlocking {
+            copyToRealm(
+                Restaurant().apply {
+                    location = Location(latitude = 20.0, longitude = 20.0)
+                }
+            )
+            copyToRealm(
+                Restaurant().apply {
+                    location = Location(latitude = 5.0, longitude = 5.0)
+                }
+            )
+            copyToRealm(
+                Restaurant().apply {
+                    location = Location(latitude = -5.0, longitude = -5.0)
+                }
+            )
+            copyToRealm(
+                Restaurant().apply {
+                    location = Location(latitude = 0.0, longitude = 0.0)
+                }
+            )
+        }
+
+        var sphere = GeoCircle.create(
+            center = GeoPoint.create(0.0, 0.0),
+            radius = Distance.fromKilometers(0.0)
+        )
+        assertEquals(1, realm.query<Restaurant>("location GEOWITHIN $0", sphere).count().find())
+
+        var box = GeoBox.create(
+            bottomLeft = GeoPoint.create(-1.0, -1.0),
+            topRight = GeoPoint.create(1.0, 1.0)
+        )
+        assertEquals(1, realm.query<Restaurant>("location GEOWITHIN $0", box).count().find())
+
+        val onlyOuterRing = GeoPolygon.create(
+            outerRing = listOf(
+                GeoPoint.create(-5.0, -5.0),
+                GeoPoint.create(5.0, -5.0),
+                GeoPoint.create(5.0, 5.0),
+                GeoPoint.create(-5.0, 5.0),
+                GeoPoint.create(-5.0, -5.0)
+            )
+        )
+        assertEquals(2, realm.query<Restaurant>("location GEOWITHIN $0", onlyOuterRing).count().find())
+
+        val polygonWithHole = GeoPolygon.create(
+            outerRing = listOf(
+                GeoPoint.create(-5.0, -5.0),
+                GeoPoint.create(5.0, -5.0),
+                GeoPoint.create(5.0, 5.0),
+                GeoPoint.create(-5.0, 5.0),
+                GeoPoint.create(-5.0, -5.0)
+            ),
+            holes = arrayOf(
+                listOf(
+                    GeoPoint.create(-4.0, -4.0),
+                    GeoPoint.create(4.0, -4.0),
+                    GeoPoint.create(4.0, 4.0),
+                    GeoPoint.create(-4.0, 4.0),
+                    GeoPoint.create(-4.0, -4.0)
+                )
+            )
+        )
+        assertEquals(1, realm.query<Restaurant>("location GEOWITHIN $0", polygonWithHole).count().find())
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ import io.realm.kotlin.internal.geo.UnmanagedGeoPoint`
`88`	`88`	`*`
`89`	`89`	`* val newYork = GeoPoint.create(latitude = 40.730610, longitude = -73.935242)`
`90`	`90`	`* val searchArea = GeoCircle.create(center = newYork, radius = Distance.fromMiles(2.0))`
`91`		`- * val restaurants = realm.query<Restaurant>("location GEOWITHIN $searchArea").find()`
	`91`	`+ * val restaurants = realm.query<Restaurant>("location GEOWITHIN $0", searchArea).find()`
`92`	`92`	* ```
`93`	`93`	`*`
`94`	`94`	`* A proper persistable GeoPoint class will be implemented in an upcoming release.`