couchbase 3.5.1 → 3.5.2

data/ext/couchbase/couchbase/create_index_analytics_options.hxx

@@ -19,7 +19,6 @@
 
 #include <couchbase/common_options.hxx>
 #include <couchbase/error_codes.hxx>
-#include <couchbase/manager_error_context.hxx>
 
 #include <functional>
 #include <optional>
@@ -29,68 +28,69 @@ namespace couchbase
 {
 class create_index_analytics_options : public common_options<create_index_analytics_options>
 {
-  public:
-    /**
-     * Ignore error if the index already exists.
-     *
-     * defaults to `false`
-     *
-     * @param ignore_if_exists
-     * @return reference to this object, for use in chaining
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto ignore_if_exists(bool ignore_if_exists) -> create_index_analytics_options&
-    {
-        ignore_if_exists_ = ignore_if_exists;
-        return self();
-    }
+public:
+  /**
+   * Ignore error if the index already exists.
+   *
+   * defaults to `false`
+   *
+   * @param ignore_if_exists
+   * @return reference to this object, for use in chaining
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto ignore_if_exists(bool ignore_if_exists) -> create_index_analytics_options&
+  {
+    ignore_if_exists_ = ignore_if_exists;
+    return self();
+  }
 
-    /**
-     * The name of the dataverse the index should be created into
-     *
-     * @param dataverse_name
-     * @return reference to this object, for use in chaining
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto dataverse_name(std::string dataverse_name) -> create_index_analytics_options&
-    {
-        dataverse_name_ = std::move(dataverse_name);
-        return self();
-    }
+  /**
+   * The name of the dataverse the index should be created into
+   *
+   * @param dataverse_name
+   * @return reference to this object, for use in chaining
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto dataverse_name(std::string dataverse_name) -> create_index_analytics_options&
+  {
+    dataverse_name_ = std::move(dataverse_name);
+    return self();
+  }
 
-    /**
-     * Immutable value object representing consistent options.
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    struct built : public common_options<create_index_analytics_options>::built {
-        bool ignore_if_exists{};
-        std::optional<std::string> dataverse_name{};
-    };
+  /**
+   * Immutable value object representing consistent options.
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  struct built : public common_options<create_index_analytics_options>::built {
+    bool ignore_if_exists{};
+    std::optional<std::string> dataverse_name{};
+  };
 
-    /**
-     * Validates options and returns them as an immutable value.
-     *
-     * @return consistent options as an immutable value
-     *
-     * @exception std::system_error with code errc::common::invalid_argument if the options are not valid
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    [[nodiscard]] auto build() const -> built
-    {
-        return { build_common_options(), ignore_if_exists_, dataverse_name_ };
-    }
+  /**
+   * Validates options and returns them as an immutable value.
+   *
+   * @return consistent options as an immutable value
+   *
+   * @exception std::system_error with code errc::common::invalid_argument if the options are not
+   * valid
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  [[nodiscard]] auto build() const -> built
+  {
+    return { build_common_options(), ignore_if_exists_, dataverse_name_ };
+  }
 
-  private:
-    bool ignore_if_exists_{ false };
-    std::optional<std::string> dataverse_name_{};
+private:
+  bool ignore_if_exists_{ false };
+  std::optional<std::string> dataverse_name_{};
 };
 
 /**
@@ -99,5 +99,5 @@ class create_index_analytics_options : public common_options<create_index_analyt
  * @since 1.0.0
  * @uncommitted
  */
-using create_index_analytics_handler = std::function<void(couchbase::manager_error_context)>;
+using create_index_analytics_handler = std::function<void(error)>;
 } // namespace couchbase

data/ext/couchbase/couchbase/create_link_analytics_options.hxx

@@ -19,7 +19,6 @@
 
 #include <couchbase/common_options.hxx>
 #include <couchbase/error_codes.hxx>
-#include <couchbase/manager_error_context.hxx>
 
 #include <functional>
 
@@ -27,30 +26,31 @@ namespace couchbase
 {
 class create_link_analytics_options : public common_options<create_link_analytics_options>
 {
-  public:
-    /**
-     * Immutable value object representing consistent options.
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    struct built : public common_options<create_link_analytics_options>::built {
-    };
+public:
+  /**
+   * Immutable value object representing consistent options.
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  struct built : public common_options<create_link_analytics_options>::built {
+  };
 
-    /**
-     * Validates options and returns them as an immutable value.
-     *
-     * @return consistent options as an immutable value
-     *
-     * @exception std::system_error with code errc::common::invalid_argument if the options are not valid
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    [[nodiscard]] auto build() const -> built
-    {
-        return { build_common_options() };
-    }
+  /**
+   * Validates options and returns them as an immutable value.
+   *
+   * @return consistent options as an immutable value
+   *
+   * @exception std::system_error with code errc::common::invalid_argument if the options are not
+   * valid
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  [[nodiscard]] auto build() const -> built
+  {
+    return { build_common_options() };
+  }
 };
 
 /**
@@ -59,5 +59,5 @@ class create_link_analytics_options : public common_options<create_link_analytic
  * @since 1.0.0
  * @uncommitted
  */
-using create_link_analytics_handler = std::function<void(couchbase::manager_error_context)>;
+using create_link_analytics_handler = std::function<void(error)>;
 } // namespace couchbase

data/ext/couchbase/couchbase/create_primary_query_index_options.hxx

@@ -18,8 +18,8 @@
 #pragma once
 
 #include <couchbase/common_options.hxx>
+#include <couchbase/error.hxx>
 #include <couchbase/error_codes.hxx>
-#include <couchbase/manager_error_context.hxx>
 
 #include <optional>
 #include <string>
@@ -28,102 +28,103 @@ namespace couchbase
 {
 class create_primary_query_index_options : public common_options<create_primary_query_index_options>
 {
-  public:
-    /**
-     * Give the primary index a name
-     *
-     * defaults to `#primary`
-     *
-     * @param index_name
-     * @return reference to this object, for use in chaining.
-     */
-    auto index_name(std::string index_name) -> create_primary_query_index_options&
-    {
-        index_name_.emplace(index_name);
-        return self();
-    }
-    /**
-     * Set flag to ignore error if the index already exists
-     *
-     * The default is to not ignore the error.
-     *
-     * @param ignore_if_exists  if true, we don't return an error if the index already exists
-     * @return reference to this object, for use in chaining.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto ignore_if_exists(bool ignore_if_exists) -> create_primary_query_index_options&
-    {
-        ignore_if_exists_ = ignore_if_exists;
-        return self();
-    }
-    /**
-     * Set flag to defer building of the index
-     *
-     * The default is false, meaning start building the index immediately.
-     *
-     * @param deferred
-     * @return reference to this object, for use in chaining.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto build_deferred(bool deferred) -> create_primary_query_index_options&
-    {
-        deferred_ = deferred;
-        return self();
-    }
+public:
+  /**
+   * Give the primary index a name
+   *
+   * defaults to `#primary`
+   *
+   * @param index_name
+   * @return reference to this object, for use in chaining.
+   */
+  auto index_name(std::string index_name) -> create_primary_query_index_options&
+  {
+    index_name_.emplace(index_name);
+    return self();
+  }
+  /**
+   * Set flag to ignore error if the index already exists
+   *
+   * The default is to not ignore the error.
+   *
+   * @param ignore_if_exists  if true, we don't return an error if the index already exists
+   * @return reference to this object, for use in chaining.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto ignore_if_exists(bool ignore_if_exists) -> create_primary_query_index_options&
+  {
+    ignore_if_exists_ = ignore_if_exists;
+    return self();
+  }
+  /**
+   * Set flag to defer building of the index
+   *
+   * The default is false, meaning start building the index immediately.
+   *
+   * @param deferred
+   * @return reference to this object, for use in chaining.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto build_deferred(bool deferred) -> create_primary_query_index_options&
+  {
+    deferred_ = deferred;
+    return self();
+  }
 
-    /**
-     * Set the number of replicas the index will have.
-     *
-     *
-     * @param num_replicas
-     * @return reference to this object, for use in chaining.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto num_replicas(uint8_t num_replicas) -> create_primary_query_index_options&
-    {
-        num_replicas_ = num_replicas;
-        return self();
-    }
+  /**
+   * Set the number of replicas the index will have.
+   *
+   *
+   * @param num_replicas
+   * @return reference to this object, for use in chaining.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto num_replicas(uint8_t num_replicas) -> create_primary_query_index_options&
+  {
+    num_replicas_ = num_replicas;
+    return self();
+  }
 
-    /**
-     * Immutable value object representing consistent options.
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    struct built : public common_options<create_primary_query_index_options>::built {
-        const std::optional<std::string> index_name{};
-        bool ignore_if_exists{};
-        bool deferred{};
-        std::optional<uint8_t> num_replicas{};
-    };
+  /**
+   * Immutable value object representing consistent options.
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  struct built : public common_options<create_primary_query_index_options>::built {
+    const std::optional<std::string> index_name{};
+    bool ignore_if_exists{};
+    bool deferred{};
+    std::optional<uint8_t> num_replicas{};
+  };
 
-    /**
-     * Validates options and returns them as an immutable value.
-     *
-     * @return consistent options as an immutable value
-     *
-     * @exception std::system_error with code errc::common::invalid_argument if the options are not valid
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    [[nodiscard]] auto build() const -> built
-    {
-        return { build_common_options(), index_name_, ignore_if_exists_, deferred_, num_replicas_ };
-    }
+  /**
+   * Validates options and returns them as an immutable value.
+   *
+   * @return consistent options as an immutable value
+   *
+   * @exception std::system_error with code errc::common::invalid_argument if the options are not
+   * valid
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  [[nodiscard]] auto build() const -> built
+  {
+    return { build_common_options(), index_name_, ignore_if_exists_, deferred_, num_replicas_ };
+  }
 
-  private:
-    std::optional<std::string> index_name_{};
-    bool ignore_if_exists_{ false };
-    bool deferred_{ false };
-    std::optional<uint8_t> num_replicas_{};
+private:
+  std::optional<std::string> index_name_{};
+  bool ignore_if_exists_{ false };
+  bool deferred_{ false };
+  std::optional<uint8_t> num_replicas_{};
 };
 
 /**
@@ -133,5 +134,5 @@ class create_primary_query_index_options : public common_options<create_primary_
  * @uncommitted
  */
 
-using create_primary_query_index_handler = std::function<void(couchbase::manager_error_context)>;
+using create_primary_query_index_handler = std::function<void(error)>;
 } // namespace couchbase

data/ext/couchbase/couchbase/create_query_index_options.hxx

@@ -18,8 +18,8 @@
 #pragma once
 
 #include <couchbase/common_options.hxx>
+#include <couchbase/error.hxx>
 #include <couchbase/error_codes.hxx>
-#include <couchbase/manager_error_context.hxx>
 
 #include <optional>
 #include <string>
@@ -28,104 +28,105 @@ namespace couchbase
 {
 class create_query_index_options : public common_options<create_query_index_options>
 {
-  public:
-    /**
-     * Set flag to ignore error if the index already exists
-     *
-     * The default is to not ignore the error.
-     *
-     * @param ignore_if_exists  if true, we don't return an error if the index already exists
-     * @return reference to this object, for use in chaining.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto ignore_if_exists(bool ignore_if_exists) -> create_query_index_options&
-    {
-        ignore_if_exists_ = ignore_if_exists;
-        return self();
-    }
-    /**
-     * Set flag to defer building of the index
-     *
-     * The default is false, meaning start building the index immediately.
-     *
-     * @param deferred
-     * @return reference to this object, for use in chaining.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto build_deferred(bool deferred) -> create_query_index_options&
-    {
-        deferred_ = deferred;
-        return self();
-    }
+public:
+  /**
+   * Set flag to ignore error if the index already exists
+   *
+   * The default is to not ignore the error.
+   *
+   * @param ignore_if_exists  if true, we don't return an error if the index already exists
+   * @return reference to this object, for use in chaining.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto ignore_if_exists(bool ignore_if_exists) -> create_query_index_options&
+  {
+    ignore_if_exists_ = ignore_if_exists;
+    return self();
+  }
+  /**
+   * Set flag to defer building of the index
+   *
+   * The default is false, meaning start building the index immediately.
+   *
+   * @param deferred
+   * @return reference to this object, for use in chaining.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto build_deferred(bool deferred) -> create_query_index_options&
+  {
+    deferred_ = deferred;
+    return self();
+  }
 
-    /**
-     * Set the number of replicas the index will have.
-     *
-     *
-     * @param num_replicas
-     * @return reference to this object, for use in chaining.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto num_replicas(uint8_t num_replicas) -> create_query_index_options&
-    {
-        num_replicas_ = num_replicas;
-        return self();
-    }
-    /**
-     * Supply an extra condition on this index.
-     *
-     * This is the contents of the WHERE clause when creating the index.
-     *
-     * @param condition
-     * @return reference to this object, for use in chaining.
-     */
-    auto condition(std::string condition) -> create_query_index_options&
-    {
-        condition_.emplace(std::move(condition));
-        return self();
-    }
+  /**
+   * Set the number of replicas the index will have.
+   *
+   *
+   * @param num_replicas
+   * @return reference to this object, for use in chaining.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto num_replicas(uint8_t num_replicas) -> create_query_index_options&
+  {
+    num_replicas_ = num_replicas;
+    return self();
+  }
+  /**
+   * Supply an extra condition on this index.
+   *
+   * This is the contents of the WHERE clause when creating the index.
+   *
+   * @param condition
+   * @return reference to this object, for use in chaining.
+   */
+  auto condition(std::string condition) -> create_query_index_options&
+  {
+    condition_.emplace(std::move(condition));
+    return self();
+  }
 
-    /**
-     * Immutable value object representing consistent options.
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    struct built : public common_options<create_query_index_options>::built {
-        bool ignore_if_exists{};
-        bool deferred{};
-        std::optional<std::string> condition{};
-        std::optional<uint8_t> num_replicas{};
-    };
+  /**
+   * Immutable value object representing consistent options.
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  struct built : public common_options<create_query_index_options>::built {
+    bool ignore_if_exists{};
+    bool deferred{};
+    std::optional<std::string> condition{};
+    std::optional<uint8_t> num_replicas{};
+  };
 
-    /**
-     * Validates options and returns them as an immutable value.
-     *
-     * @return consistent options as an immutable value
-     *
-     * @exception std::system_error with code errc::common::invalid_argument if the options are not valid
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    [[nodiscard]] auto build() const -> built
-    {
-        return { build_common_options(), ignore_if_exists_, deferred_, condition_, num_replicas_ };
-    }
+  /**
+   * Validates options and returns them as an immutable value.
+   *
+   * @return consistent options as an immutable value
+   *
+   * @exception std::system_error with code errc::common::invalid_argument if the options are not
+   * valid
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  [[nodiscard]] auto build() const -> built
+  {
+    return { build_common_options(), ignore_if_exists_, deferred_, condition_, num_replicas_ };
+  }
 
-  private:
-    std::optional<std::string> scope_name_{};
-    std::optional<std::string> collection_name_{};
-    bool ignore_if_exists_{ false };
-    bool deferred_{ false };
-    std::optional<uint8_t> num_replicas_{};
-    std::optional<std::string> condition_{};
+private:
+  std::optional<std::string> scope_name_{};
+  std::optional<std::string> collection_name_{};
+  bool ignore_if_exists_{ false };
+  bool deferred_{ false };
+  std::optional<uint8_t> num_replicas_{};
+  std::optional<std::string> condition_{};
 };
 
 /**
@@ -135,5 +136,5 @@ class create_query_index_options : public common_options<create_query_index_opti
  * @uncommitted
  */
 
-using create_query_index_handler = std::function<void(couchbase::manager_error_context)>;
+using create_query_index_handler = std::function<void(error)>;
 } // namespace couchbase

data/ext/couchbase/couchbase/create_scope_options.hxx

@@ -25,17 +25,17 @@
 namespace couchbase
 {
 struct create_scope_options : public common_options<create_scope_options> {
-  public:
-    struct built : public common_options<create_scope_options>::built {
-    };
+public:
+  struct built : public common_options<create_scope_options>::built {
+  };
 
-    [[nodiscard]] auto build() const -> built
-    {
-        return { build_common_options() };
-    }
+  [[nodiscard]] auto build() const -> built
+  {
+    return { build_common_options() };
+  }
 
-  private:
+private:
 };
 
-using create_scope_handler = std::function<void(couchbase::manager_error_context)>;
+using create_scope_handler = std::function<void(error)>;
 } // namespace couchbase