Merge branch 'v10' of github.com:realm/realm-object-store into kneth/…

…remove-gn-and-adapter
realm · Feb 24, 2020 · c9537de · c9537de
2 parents bce680c + 708842d
commit c9537de
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 11 deletions.
diff --git a/external/catch b/external/catch
diff --git a/src/object_store.cpp b/src/object_store.cpp
@@ -765,7 +765,7 @@ Schema ObjectStore::schema_from_group(Group const& group) {
     return schema;
 }
 
-util::Optional<Property> ObjectStore::property_for_column_index(ConstTableRef& table, ColKey column_key)
+util::Optional<Property> ObjectStore::property_for_column_key(ConstTableRef& table, ColKey column_key)
 {
     StringData column_name = table->get_column_name(column_key);
 

diff --git a/src/object_store.hpp b/src/object_store.hpp
@@ -102,7 +102,7 @@ class ObjectStore {
 
     // get the property for a existing column in the given table. return none if the column is reserved internally.
     // NOTE: is_primary won't be set for the returned property.
-    static util::Optional<Property> property_for_column_index(ConstTableRef& table, ColKey column_key);
+    static util::Optional<Property> property_for_column_key(ConstTableRef& table, ColKey column_key);
 
     static void set_schema_keys(Group const& group, Schema& schema);
 

diff --git a/tests/benchmarks/main.cpp b/tests/benchmarks/main.cpp
@@ -18,9 +18,6 @@
 
 #define CATCH_CONFIG_ENABLE_BENCHMARKING
 
-// FIXME: the nextafter define below can be removed once we upgrade to an
-// Android ndk version which has support for std::nextafter (absent in ndk r10e)
-#define CATCH_CONFIG_GLOBAL_NEXTAFTER
 #define CATCH_CONFIG_RUNNER
 #include "catch2/catch.hpp"
 

diff --git a/tests/main.cpp b/tests/main.cpp
@@ -16,9 +16,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////
 
-// FIXME: the nextafter define below can be removed once we upgrade to an
-// Android ndk version which has support for std::nextafter (absent in ndk r10e)
-#define CATCH_CONFIG_GLOBAL_NEXTAFTER
 #define CATCH_CONFIG_RUNNER
 #include "catch2/catch.hpp"
 

diff --git a/tests/object_store.cpp b/tests/object_store.cpp
@@ -38,7 +38,7 @@ TEST_CASE("ObjectStore: table_name_for_object_type()") {
     }
 }
 
-TEST_CASE("ObjectStore:: property_for_column_index()") {
+TEST_CASE("ObjectStore:: property_for_column_key()") {
     SECTION("Property should match the schema") {
         Schema schema = {
             {"object", {
@@ -65,7 +65,7 @@ TEST_CASE("ObjectStore:: property_for_column_index()") {
 
         auto all_columns = table->get_column_keys();
         for (auto col : all_columns) {
-            auto property = ObjectStore::property_for_column_index(table, col);
+            auto property = ObjectStore::property_for_column_key(table, col);
             if (!property) {
                 FAIL();
                 continue;
+7 −3		CMakeLists.txt
+2 −2		README.md
+6 −1		appveyor.yml
+1 −0		codecov.yml
+5 −7		docs/benchmarks.md
+5 −1		docs/ci-and-misc.md
+1 −0		docs/command-line.md
+4 −0		docs/contributing.md
+11 −0		docs/deprecations.md
+5 −3		docs/generators.md
+9 −0		docs/limitations.md
+17 −1		docs/matchers.md
+0 −3		docs/opensource-users.md
+60 −0		docs/release-notes.md
+3 −2		docs/release-process.md
+1 −0		docs/reporters.md
+9 −2		examples/231-Cfg-OutputStreams.cpp
+5 −3		examples/301-Gen-MapTypeConversion.cpp
+3 −3		include/catch.hpp
+1 −1		include/internal/benchmark/catch_benchmark.hpp
+29 −0		include/internal/benchmark/catch_benchmarking_all.hpp
+51 −45		include/internal/benchmark/catch_constructor.hpp
+2 −1		include/internal/benchmark/detail/catch_stats.cpp
+2 −1		include/internal/catch_capture.hpp
+7 −1		include/internal/catch_commandline.cpp
+56 −34		include/internal/catch_compiler_capabilities.h
+1 −1		include/internal/catch_console_colour.cpp
+1 −0		include/internal/catch_context.h
+1 −1		include/internal/catch_debugger.cpp
+11 −0		include/internal/catch_debugger.h
+10 −11		include/internal/catch_generators.hpp
+2 −12		include/internal/catch_generators_generic.hpp
+1 −1		include/internal/catch_generators_specific.hpp
+2 −1		include/internal/catch_interfaces_exception.h
+2 −0		include/internal/catch_interfaces_reporter.h
+23 −18		include/internal/catch_matchers_floating.cpp
+25 −13		include/internal/catch_meta.hpp
+25 −11		include/internal/catch_preprocessor.hpp
+2 −2		include/internal/catch_random_number_generator.h
+6 −4		include/internal/catch_reporter_registrars.hpp
+4 −2		include/internal/catch_section.h
+10 −2		include/internal/catch_session.cpp
+3 −1		include/internal/catch_stream.h
+13 −47		include/internal/catch_stringref.cpp
+27 −61		include/internal/catch_stringref.h
+2 −1		include/internal/catch_tag_alias_autoregistrar.h
+33 −21		include/internal/catch_test_registry.h
+4 −0		include/internal/catch_test_spec.cpp
+3 −1		include/internal/catch_test_spec.h
+89 −19		include/internal/catch_test_spec_parser.cpp
+15 −23		include/internal/catch_test_spec_parser.h
+7 −9		include/internal/catch_tostring.cpp
+1 −1		include/internal/catch_version.cpp
+78 −28		include/internal/catch_xmlwriter.cpp
+18 −7		include/internal/catch_xmlwriter.h
+3 −1		include/reporters/catch_reporter_bases.hpp
+5 −1		include/reporters/catch_reporter_console.cpp
+3 −1		include/reporters/catch_reporter_console.h
+22 −6		include/reporters/catch_reporter_junit.cpp
+8 −1		include/reporters/catch_reporter_listening.cpp
+4 −2		include/reporters/catch_reporter_listening.h
+181 −0		include/reporters/catch_reporter_sonarqube.hpp
+2 −2		include/reporters/catch_reporter_xml.cpp
+14 −4		projects/CMakeLists.txt
+11 −0		projects/ExtraTests/CMakeLists.txt
+0 −8		projects/ExtraTests/X20-BenchmarkingMacros.cpp
+12 −0		projects/ExtraTests/X90-WindowsHeaderInclusion.cpp
+117 −77		projects/SelfTest/Baselines/compact.sw.approved.txt
+1 −1		projects/SelfTest/Baselines/console.std.approved.txt
+703 −391		projects/SelfTest/Baselines/console.sw.approved.txt
+647 −130		projects/SelfTest/Baselines/junit.sw.approved.txt
+1,726 −0		projects/SelfTest/Baselines/sonarqube.sw.approved.txt
+1,009 −576		projects/SelfTest/Baselines/xml.sw.approved.txt
+14 −4		projects/SelfTest/IntrospectiveTests/CmdLine.tests.cpp
+67 −0		projects/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp
+52 −63		projects/SelfTest/IntrospectiveTests/String.tests.cpp
+33 −31		projects/SelfTest/IntrospectiveTests/Xml.tests.cpp
+1 −0		projects/SelfTest/Misc/invalid-test-names.input
+1 −0		projects/SelfTest/TestMain.cpp
+14 −0		projects/SelfTest/UsageTests/Benchmark.tests.cpp
+6 −4		projects/SelfTest/UsageTests/Matchers.tests.cpp
+3 −1		projects/SelfTest/UsageTests/Misc.tests.cpp
+2 −2		projects/SelfTest/UsageTests/ToStringVariant.tests.cpp
+0 −6		projects/SelfTest/UsageTests/Tricky.tests.cpp
+4 −0		scripts/approvalTests.py
+24 −2		scripts/generateSingleHeader.py
+1 −1		scripts/releaseCommon.py
+1 −1		scripts/updateWandbox.py
+592 −338		single_include/catch2/catch.hpp
+181 −0		single_include/catch2/catch_reporter_sonarqube.hpp