RCBC-504: Update core and version generation

Author: avsej

ext/CMakeLists.txt

@@ -61,11 +61,14 @@ add_library(
   rcb_version.cxx
   rcb_views.cxx)
 target_include_directories(couchbase PRIVATE ${PROJECT_BINARY_DIR}/generated)
-target_include_directories(couchbase PRIVATE SYSTEM ${RUBY_INCLUDE_DIR}
-    ${PROJECT_SOURCE_DIR}/couchbase
-    ${PROJECT_BINARY_DIR}/couchbase/generated
-    ${PROJECT_SOURCE_DIR}/couchbase/third_party/cxx_function
-    ${PROJECT_SOURCE_DIR}/couchbase/third_party/expected/include)
+target_include_directories(
+  couchbase
+  PRIVATE SYSTEM
+          ${RUBY_INCLUDE_DIR}
+          ${PROJECT_SOURCE_DIR}/couchbase
+          ${PROJECT_BINARY_DIR}/couchbase/generated
+          ${PROJECT_SOURCE_DIR}/couchbase/third_party/cxx_function
+          ${PROJECT_SOURCE_DIR}/couchbase/third_party/expected/include)
 target_link_libraries(
   couchbase
   PRIVATE project_options

ext/couchbase

@@ -104,6 +104,7 @@ def sys(*cmd)
 elsif ENV["CB_STATIC_OPENSSL"]
   cmake_flags << "-DCOUCHBASE_CXX_CLIENT_STATIC_OPENSSL=ON"
 end
+cmake_flags << "-DCOUCHBASE_CXX_CLIENT_WRAPPER_UNIFIED_ID=ruby/#{Couchbase::VERSION[:sdk]}"
 
 unless cmake_flags.grep(/BORINGSSL/)
   case RbConfig::CONFIG["target_os"]

ext/extconf.rb

@@ -911,17 +911,17 @@ cb_Backend_analytics_link_get_all(VALUE self, VALUE options)
         cb_throw_error(
           resp.ctx,
           fmt::format(R"(unable to retrieve links type={}, dataverse="{}",  name="{}")",
-                      req.link_type,
-                      req.link_name,
-                      req.dataverse_name));
+                      req.link_type.value_or("-"),
+                      req.link_name.value_or("-"),
+                      req.dataverse_name.value_or("-")));
       } else {
         const auto& first_error = resp.errors.front();
         cb_throw_error(
           resp.ctx,
           fmt::format(R"(unable to retrieve links type={}, dataverse="{}",  name="{}" ({}: {}))",
-                      req.link_type,
-                      req.link_name,
-                      req.dataverse_name,
+                      req.link_type.value_or("-"),
+                      req.link_name.value_or("-"),
+                      req.dataverse_name.value_or("-"),
                       first_error.code,
                       first_error.message));
       }