diff --git a/src/RealmJS.xcodeproj/project.pbxproj b/src/RealmJS.xcodeproj/project.pbxproj index 40055894..c2e53346 100644 --- a/src/RealmJS.xcodeproj/project.pbxproj +++ b/src/RealmJS.xcodeproj/project.pbxproj @@ -307,7 +307,7 @@ 02022A731DA47EC8000F0C4F /* format.cpp */, 02022A741DA47EC8000F0C4F /* format.hpp */, 02022A751DA47EC8000F0C4F /* generic */, - 02022A771DA47EC8000F0C4F /* node */, + 02022A771DA47EC8000F0C4F /* uv */, ); name = util; path = src/util; @@ -337,12 +337,12 @@ path = generic; sourceTree = ""; }; - 02022A771DA47EC8000F0C4F /* node */ = { + 02022A771DA47EC8000F0C4F /* uv */ = { isa = PBXGroup; children = ( 02022A781DA47EC8000F0C4F /* event_loop_signal.hpp */, ); - path = node; + path = uv; sourceTree = ""; }; 0270BC3D1B7CFBFD00010E03 /* RealmJS */ = { diff --git a/src/js_results.hpp b/src/js_results.hpp index 894a6c81..5f64cd74 100644 --- a/src/js_results.hpp +++ b/src/js_results.hpp @@ -128,7 +128,7 @@ typename T::Object ResultsClass::create_filtered(ContextType ctx, const U &co query_builder::ArgumentConverter> converter(accessor, &arguments[1], argc - 1); query_builder::apply_predicate(query, predicate, converter, realm->schema(), object_schema.name); - return create_instance(ctx, realm::Results(realm, std::move(query))); + return create_instance(ctx, collection.filter(std::move(query))); } template @@ -186,9 +186,7 @@ typename T::Object ResultsClass::create_sorted(ContextType ctx, const U &coll } auto table = realm::ObjectStore::table_for_object_type(realm->read_group(), object_schema.name); - auto results = new realm::js::Results(realm, collection.get_query(), - {*table, std::move(columns), std::move(ascending)}); - return create_object>(ctx, results); + return create_instance(ctx, collection.sort({*table, std::move(columns), std::move(ascending)})); } template diff --git a/src/object-store b/src/object-store index ffc66731..0868f93b 160000 --- a/src/object-store +++ b/src/object-store @@ -1 +1 @@ -Subproject commit ffc6673173ea4091f6a119ba01532b4b9fd9862f +Subproject commit 0868f93b173490138e5fd6c78c13fb1fbc5e6f7f