Skip to content

[master < T55] Add column names to cpp client #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gitbuda merged 6 commits into from
Jun 28, 2023
Merged

[master < T55] Add column names to cpp client #55

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2fbf7d2
Get columns addition of method
Josipmrden Jun 5, 2023
818e734
Add population of columns
Josipmrden Jun 5, 2023
5297906
Fix format
gitbuda Jun 28, 2023
0b3ae2d
Merge branch 'master' into T634-FL-add-column-names-to-cpp-client
Josipmrden Jun 28, 2023
5dbf453
Address PR comments
Josipmrden Jun 28, 2023
62d2bae
Format code
Josipmrden Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions mgclient_cpp/include/mgclient.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ class Client {
/// \brief Fetches all results.
std::optional<std::vector<std::vector<Value>>> FetchAll();

const std::vector<std::string> &GetColumns() const;

/// \brief Start a transaction.
/// \return true when the transaction was successfully started, false
/// otherwise.
Expand All @@ -138,6 +140,7 @@ class Client {
explicit Client(mg_session *session);

mg_session *session_;
std::vector<std::string> columns_;
};

inline std::unique_ptr<Client> Client::Connect(const Client::Params &params) {
Expand Down Expand Up @@ -177,8 +180,9 @@ inline int Client::Init() { return mg_init(); }
inline void Client::Finalize() { mg_finalize(); }

inline bool Client::Execute(const std::string &statement) {
const mg_list *columns;
int status = mg_session_run(session_, statement.c_str(), nullptr, nullptr,
nullptr, nullptr);
&columns, nullptr);
if (status < 0) {
return false;
}
Expand All @@ -188,13 +192,21 @@ inline bool Client::Execute(const std::string &statement) {
return false;
}

const size_t list_length = mg_list_size(columns);
columns_.clear();
for (size_t i = 0; i < list_length; i++) {
columns_.push_back(
std::string(Value(mg_list_at(columns, i)).ValueString()));
}

return true;
}

inline bool Client::Execute(const std::string &statement,
const ConstMap &params) {
const mg_list *columns;
int status = mg_session_run(session_, statement.c_str(), params.ptr(),
nullptr, nullptr, nullptr);
nullptr, &columns, nullptr);
if (status < 0) {
return false;
}
Expand All @@ -203,6 +215,14 @@ inline bool Client::Execute(const std::string &statement,
if (status < 0) {
return false;
}

const size_t list_length = mg_list_size(columns);
columns_.clear();
for (size_t i = 0; i < list_length; i++) {
columns_.push_back(
std::string(Value(mg_list_at(columns, i)).ValueString()));
}

return true;
}

Expand Down Expand Up @@ -248,6 +268,10 @@ inline std::optional<std::vector<std::vector<Value>>> Client::FetchAll() {
return data;
}

inline const std::vector<std::string> &Client::GetColumns() const {
return columns_;
}

inline bool Client::BeginTransaction() {
return mg_session_begin_transaction(session_, nullptr) == 0;
}
Expand Down