From 2f2e197d8cf150674a2e97498b11a9364a61fe1c Mon Sep 17 00:00:00 2001
From: Daniel <d.hornung@indiscale.com>
Date: Mon, 23 Aug 2021 13:26:07 +0200
Subject: [PATCH] FIX: Removed UniqueResult from cxxcaosdbcli.
Also added building instruction to CI.
---
.gitlab-ci.yml | 2 ++
src/cxxcaosdbcli.cpp | 7 +++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d81b6e4..4957970 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -91,6 +91,8 @@ test:
- cmake -DCMAKE_BUILD_TYPE=Debug ..
- cmake --build .
- cmake --build . --target unit_test_coverage
+ - cmake --build . --target cxxcaosdbcli
+ - cmake --build . --target ccaosdbcli
# trigger the integration tests
trigger_inttest:
diff --git a/src/cxxcaosdbcli.cpp b/src/cxxcaosdbcli.cpp
index 1760975..a86c9eb 100644
--- a/src/cxxcaosdbcli.cpp
+++ b/src/cxxcaosdbcli.cpp
@@ -26,7 +26,7 @@
#include "caosdb/entity.h" // for Entity
#include "caosdb/exceptions.h" // for ConfigurationError
#include "caosdb/info.h" // for VersionInfo
-#include "caosdb/transaction.h" // for Transaction, UniqueResult, ResultSet
+#include "caosdb/transaction.h" // for Transaction, ResultSet
#include <iostream> // for operator<<, basic_ostream, basic_ost...
#include <memory> // for unique_ptr, allocator, __shared_ptr_...
#include <string> // for operator<<, char_traits
@@ -52,11 +52,10 @@ auto main() -> int {
auto transaction(connection->CreateTransaction());
transaction->RetrieveById("20");
transaction->Execute();
- const auto &result_set =
- dynamic_cast<const caosdb::transaction::UniqueResult &>(transaction->GetResultSet());
+ const auto &result_set = transaction->GetResultSet();
// print description
- std::cout << "Entity Description: " << result_set.GetEntity().GetDescription() << std::endl;
+ std::cout << "Entity Description: " << result_set.at(0).GetDescription() << std::endl;
return 0;
} catch (const caosdb::exceptions::ConfigurationError &exc) {
--
GitLab