From a80abf2b93e50003d4818d8d1f3c97912b7de182 Mon Sep 17 00:00:00 2001 From: Pasin Suriyentrakorn Date: Mon, 4 Nov 2024 11:16:18 -0800 Subject: [PATCH] ReEnable Test Joins with Collections Test for CBL-6243 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ReEnable Test Joins with Collections Test’s Use Full Collection Name section for CBL-6243. * Fixed DatabaseTest.cc build for the latest xcode. --- test/DatabaseTest.cc | 2 +- test/QueryTest.cc | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/test/DatabaseTest.cc b/test/DatabaseTest.cc index 1dd04c15..39494cf2 100644 --- a/test/DatabaseTest.cc +++ b/test/DatabaseTest.cc @@ -771,7 +771,7 @@ TEST_CASE_METHOD(DatabaseTest, "Legacy - Database change notifications from diff CBLDocument_Release(doc); }; - thread t1([=]() { createDoc(db); }); + thread t1([&]() { createDoc(db); }); thread t2([=]() { createDoc(anotherDB); }); t1.join(); diff --git a/test/QueryTest.cc b/test/QueryTest.cc index cdc4cc35..9e97c5c5 100644 --- a/test/QueryTest.cc +++ b/test/QueryTest.cc @@ -901,8 +901,6 @@ TEST_CASE_METHOD(QueryTest, "Test Joins with Collections", "[Query]") { string queryString; - /* - CBL-6243 SECTION("Use Full Collection Name") { queryString = "SELECT flowers.name, colors.color " "FROM test.flowers " @@ -910,7 +908,6 @@ TEST_CASE_METHOD(QueryTest, "Test Joins with Collections", "[Query]") { "ON flowers.cid = colors.cid " "ORDER BY flowers.name"; } - */ SECTION("Use Alias Name") { queryString = "SELECT f.name, c.color "