realm · nicola-cab · May 4, 2023 · May 4, 2023 · May 4, 2023 · May 4, 2023
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Enhancements
 * <New feature description> (PR [#????](https://github.com/realm/realm-core/pull/????))
 * New notifiers can now be registered in write transactions until changes have actually been made in the write transaction. This makes it so that new notifications can be registered inside change notifications triggered by beginning a write transaction (unless a previous callback performed writes).
+* Expose `Results::get_query()` in the C-API. (PR [#6568](https://github.com/realm/realm-core/pull/6568))
 
 ### Fixed
 * <How do the end-user experience this issue? what was the impact?> ([#????](https://github.com/realm/realm-core/issues/????), since v?.?.?)

diff --git a/src/realm.h b/src/realm.h
@@ -2574,6 +2574,14 @@ RLM_API bool realm_results_find(realm_results_t*, realm_value_t* value, size_t*
  */
 RLM_API realm_object_t* realm_results_get_object(realm_results_t*, size_t index);
 
+/**
+ * Return the query associated to the results passed as argument.
+ *
+ * @param results the ptr to a valid results object.
+ * @return a valid ptr to realm_query_t if no error has occured
+ */
+RLM_API realm_query_t* realm_results_get_query(realm_results_t* results);
+
 /**
  * Find the index for the realm object passed as parameter inside realm results pointer passed a input parameter.
  *  @param value the value to find inside the realm results

diff --git a/src/realm/object-store/c_api/query.cpp b/src/realm/object-store/c_api/query.cpp
@@ -422,6 +422,16 @@ RLM_API realm_object_t* realm_results_get_object(realm_results_t* results, size_
     });
 }
 
+RLM_API realm_query_t* realm_results_get_query(realm_results_t* results)
+{
+    return wrap_err([&]() {
+        auto query = results->get_query();
+        auto shared_realm = results->get_realm();
+        auto ordering = query.get_ordering();
+        return new realm_query_t{std::move(query), std::move(ordering), shared_realm};
+    });
+}
+
 RLM_API bool realm_results_find_object(realm_results_t* results, realm_object_t* value, size_t* out_index,
                                        bool* out_found)
 {

diff --git a/test/object-store/c_api/c_api.cpp b/test/object-store/c_api/c_api.cpp
@@ -2591,6 +2591,19 @@ TEST_CASE("C API", "[c_api]") {
                     CHECK(found == false);
                 }
 
+                SECTION("realm_results_get_query()") {
+                    auto q2 = cptr_checked(realm_query_parse(realm, class_foo.key, "int == 123", 0, nullptr));
+                    auto r2 = cptr_checked(realm_results_filter(r.get(), q2.get()));
+                    size_t count;
+                    CHECK(checked(realm_results_count(r2.get(), &count)));
+                    CHECK(count == 1);
+                    auto results_query = cptr_checked(realm_results_get_query(r2.get()));
+                    auto result = cptr_checked(realm_query_find_all(results_query.get()));
+                    size_t count1 = 0;
+                    CHECK(checked(realm_results_count(result.get(), &count1)));
+                    CHECK(count == count1);
+                }
+
                 SECTION("realm_results_get_object()") {
                     auto p = cptr_checked(realm_results_get_object(r.get(), 0));
                     CHECK(p.get());