From 7cab60be0fb0efb1f411ed820d0aa61ddf602730 Mon Sep 17 00:00:00 2001
From: florian <f.spreckelsen@inidscale.com>
Date: Fri, 20 Aug 2021 15:31:09 +0200
Subject: [PATCH] STY: autoformatted
---
include/ccaosdb.h | 12 ++++++------
src/ccaosdb.cpp | 35 ++++++++++++++++-------------------
test/test_ccaosdb.cpp | 18 ++++++------------
3 files changed, 28 insertions(+), 37 deletions(-)
diff --git a/include/ccaosdb.h b/include/ccaosdb.h
index 80c82da..9976bf8 100644
--- a/include/ccaosdb.h
+++ b/include/ccaosdb.h
@@ -307,12 +307,12 @@ int caosdb_transaction_result_set_at(caosdb_transaction_result_set *result_set,
caosdb_entity_entity *entity, int index);
int caosdb_transaction_result_set_size(caosdb_transaction_result_set *result_set, int *out);
-int caosdb_transaction_transaction_insert_entity(
- caosdb_transaction_transaction *transaction, caosdb_entity_entity *entity);
-int caosdb_transaction_transaction_update_entity(
- caosdb_transaction_transaction *transaction, caosdb_entity_entity *entity);
-int caosdb_transaction_transaction_delete_by_id(
- caosdb_transaction_transaction *transaction, const char *id);
+int caosdb_transaction_transaction_insert_entity(caosdb_transaction_transaction *transaction,
+ caosdb_entity_entity *entity);
+int caosdb_transaction_transaction_update_entity(caosdb_transaction_transaction *transaction,
+ caosdb_entity_entity *entity);
+int caosdb_transaction_transaction_delete_by_id(caosdb_transaction_transaction *transaction,
+ const char *id);
typedef struct {
void *wrapped_property;
diff --git a/src/ccaosdb.cpp b/src/ccaosdb.cpp
index 7f7c989..28f5bd7 100644
--- a/src/ccaosdb.cpp
+++ b/src/ccaosdb.cpp
@@ -433,44 +433,40 @@ ERROR_RETURN_CODE(GENERIC_ERROR,
ERROR_RETURN_CODE(
GENERIC_ERROR,
- int caosdb_transaction_transaction_insert_entity(
- caosdb_transaction_transaction *transaction, caosdb_entity_entity *entity),
+ int caosdb_transaction_transaction_insert_entity(caosdb_transaction_transaction *transaction,
+ caosdb_entity_entity *entity),
{
- auto *wrapped_transaction = static_cast<caosdb::transaction::Transaction *>(
- transaction->wrapped_transaction);
- auto *wrapped_entity =
- static_cast<caosdb::entity::Entity *>(entity->wrapped_entity);
+ auto *wrapped_transaction =
+ static_cast<caosdb::transaction::Transaction *>(transaction->wrapped_transaction);
+ auto *wrapped_entity = static_cast<caosdb::entity::Entity *>(entity->wrapped_entity);
return wrapped_transaction->InsertEntity(wrapped_entity);
})
ERROR_RETURN_CODE(
GENERIC_ERROR,
- int caosdb_transaction_transaction_update_entity(
- caosdb_transaction_transaction *transaction, caosdb_entity_entity *entity),
+ int caosdb_transaction_transaction_update_entity(caosdb_transaction_transaction *transaction,
+ caosdb_entity_entity *entity),
{
- auto *wrapped_transaction = static_cast<caosdb::transaction::Transaction *>(
- transaction->wrapped_transaction);
- auto *wrapped_entity =
- static_cast<caosdb::entity::Entity *>(entity->wrapped_entity);
+ auto *wrapped_transaction =
+ static_cast<caosdb::transaction::Transaction *>(transaction->wrapped_transaction);
+ auto *wrapped_entity = static_cast<caosdb::entity::Entity *>(entity->wrapped_entity);
return wrapped_transaction->UpdateEntity(wrapped_entity);
})
ERROR_RETURN_CODE(GENERIC_ERROR,
int caosdb_transaction_transaction_delete_by_id(
- caosdb_transaction_transaction *transaction,
- const char *id),
+ caosdb_transaction_transaction *transaction, const char *id),
{
- auto *wrapped_transaction =
- static_cast<caosdb::transaction::Transaction *>(
- transaction->wrapped_transaction);
+ auto *wrapped_transaction = static_cast<caosdb::transaction::Transaction *>(
+ transaction->wrapped_transaction);
return wrapped_transaction->DeleteById(std::string(id));
})
ERROR_RETURN_CODE(
- GENERIC_ERROR,
+ GENERIC_ERROR,
int caosdb_transaction_transaction_execute(caosdb_transaction_transaction *transaction), {
auto *wrapped_transaction =
static_cast<caosdb::transaction::Transaction *>(transaction->wrapped_transaction);
@@ -479,7 +475,8 @@ ERROR_RETURN_CODE(
return status.GetCode();
})
-ERROR_RETURN_CODE(GENERIC_ERROR,
+ERROR_RETURN_CODE(
+ GENERIC_ERROR,
int caosdb_transaction_transaction_get_result_set(caosdb_transaction_transaction *transaction,
caosdb_transaction_result_set *out),
{
diff --git a/test/test_ccaosdb.cpp b/test/test_ccaosdb.cpp
index f1b0ea6..eaf9d5f 100644
--- a/test/test_ccaosdb.cpp
+++ b/test/test_ccaosdb.cpp
@@ -455,33 +455,27 @@ TEST_F(test_ccaosdb, test_insert_update_delete) {
caosdb_connection_connection_manager_get_default_connection(&connection);
caosdb_transaction_transaction insert_transaction;
- caosdb_connection_connection_create_transaction(&connection,
- &insert_transaction);
+ caosdb_connection_connection_create_transaction(&connection, &insert_transaction);
caosdb_entity_entity entity;
caosdb_entity_create_entity(&entity);
caosdb_entity_entity_set_name(&entity, "some_name");
- int return_code(
- caosdb_transaction_transaction_insert_entity(&insert_transaction, &entity));
+ int return_code(caosdb_transaction_transaction_insert_entity(&insert_transaction, &entity));
// For now, nothing further can be done here, so it should be READY
EXPECT_EQ(return_code, caosdb::StatusCode::READY);
caosdb_transaction_transaction update_transaction;
- caosdb_connection_connection_create_transaction(&connection,
- &update_transaction);
+ caosdb_connection_connection_create_transaction(&connection, &update_transaction);
- return_code =
- caosdb_transaction_transaction_update_entity(&update_transaction, &entity);
+ return_code = caosdb_transaction_transaction_update_entity(&update_transaction, &entity);
// No ID, so this should be an error
EXPECT_EQ(return_code, caosdb::StatusCode::ORIGINAL_ENTITY_MISSING_ID);
caosdb_transaction_transaction delete_transaction;
- caosdb_connection_connection_create_transaction(&connection,
- &delete_transaction);
+ caosdb_connection_connection_create_transaction(&connection, &delete_transaction);
- return_code =
- caosdb_transaction_transaction_delete_by_id(&delete_transaction, "some_id");
+ return_code = caosdb_transaction_transaction_delete_by_id(&delete_transaction, "some_id");
// Could add further deletions
EXPECT_EQ(return_code, caosdb::StatusCode::GO_ON);
--
GitLab