Skip to content
Snippets Groups Projects
Commit 7cab60be authored by florian's avatar florian
Browse files

STY: autoformatted

parent a3a181a9
No related branches found
No related tags found
1 merge request!15ENH: Allow insert/update/delete and files in Extern C
Pipeline #12335 passed
Pipeline: caosdb-cppinttest

#12337

    This commit is part of merge request !15. Comments created here will be created in the context of that merge request.
    ...@@ -307,12 +307,12 @@ int caosdb_transaction_result_set_at(caosdb_transaction_result_set *result_set, ...@@ -307,12 +307,12 @@ int caosdb_transaction_result_set_at(caosdb_transaction_result_set *result_set,
    caosdb_entity_entity *entity, int index); caosdb_entity_entity *entity, int index);
    int caosdb_transaction_result_set_size(caosdb_transaction_result_set *result_set, int *out); int caosdb_transaction_result_set_size(caosdb_transaction_result_set *result_set, int *out);
    int caosdb_transaction_transaction_insert_entity( int caosdb_transaction_transaction_insert_entity(caosdb_transaction_transaction *transaction,
    caosdb_transaction_transaction *transaction, caosdb_entity_entity *entity); caosdb_entity_entity *entity);
    int caosdb_transaction_transaction_update_entity( int caosdb_transaction_transaction_update_entity(caosdb_transaction_transaction *transaction,
    caosdb_transaction_transaction *transaction, caosdb_entity_entity *entity); caosdb_entity_entity *entity);
    int caosdb_transaction_transaction_delete_by_id( int caosdb_transaction_transaction_delete_by_id(caosdb_transaction_transaction *transaction,
    caosdb_transaction_transaction *transaction, const char *id); const char *id);
    typedef struct { typedef struct {
    void *wrapped_property; void *wrapped_property;
    ......
    ...@@ -433,44 +433,40 @@ ERROR_RETURN_CODE(GENERIC_ERROR, ...@@ -433,44 +433,40 @@ ERROR_RETURN_CODE(GENERIC_ERROR,
    ERROR_RETURN_CODE( ERROR_RETURN_CODE(
    GENERIC_ERROR, GENERIC_ERROR,
    int caosdb_transaction_transaction_insert_entity( int caosdb_transaction_transaction_insert_entity(caosdb_transaction_transaction *transaction,
    caosdb_transaction_transaction *transaction, caosdb_entity_entity *entity), caosdb_entity_entity *entity),
    { {
    auto *wrapped_transaction = static_cast<caosdb::transaction::Transaction *>( auto *wrapped_transaction =
    transaction->wrapped_transaction); static_cast<caosdb::transaction::Transaction *>(transaction->wrapped_transaction);
    auto *wrapped_entity = auto *wrapped_entity = static_cast<caosdb::entity::Entity *>(entity->wrapped_entity);
    static_cast<caosdb::entity::Entity *>(entity->wrapped_entity);
    return wrapped_transaction->InsertEntity(wrapped_entity); return wrapped_transaction->InsertEntity(wrapped_entity);
    }) })
    ERROR_RETURN_CODE( ERROR_RETURN_CODE(
    GENERIC_ERROR, GENERIC_ERROR,
    int caosdb_transaction_transaction_update_entity( int caosdb_transaction_transaction_update_entity(caosdb_transaction_transaction *transaction,
    caosdb_transaction_transaction *transaction, caosdb_entity_entity *entity), caosdb_entity_entity *entity),
    { {
    auto *wrapped_transaction = static_cast<caosdb::transaction::Transaction *>( auto *wrapped_transaction =
    transaction->wrapped_transaction); static_cast<caosdb::transaction::Transaction *>(transaction->wrapped_transaction);
    auto *wrapped_entity = auto *wrapped_entity = static_cast<caosdb::entity::Entity *>(entity->wrapped_entity);
    static_cast<caosdb::entity::Entity *>(entity->wrapped_entity);
    return wrapped_transaction->UpdateEntity(wrapped_entity); return wrapped_transaction->UpdateEntity(wrapped_entity);
    }) })
    ERROR_RETURN_CODE(GENERIC_ERROR, ERROR_RETURN_CODE(GENERIC_ERROR,
    int caosdb_transaction_transaction_delete_by_id( int caosdb_transaction_transaction_delete_by_id(
    caosdb_transaction_transaction *transaction, caosdb_transaction_transaction *transaction, const char *id),
    const char *id),
    { {
    auto *wrapped_transaction = auto *wrapped_transaction = static_cast<caosdb::transaction::Transaction *>(
    static_cast<caosdb::transaction::Transaction *>( transaction->wrapped_transaction);
    transaction->wrapped_transaction);
    return wrapped_transaction->DeleteById(std::string(id)); return wrapped_transaction->DeleteById(std::string(id));
    }) })
    ERROR_RETURN_CODE( ERROR_RETURN_CODE(
    GENERIC_ERROR, GENERIC_ERROR,
    int caosdb_transaction_transaction_execute(caosdb_transaction_transaction *transaction), { int caosdb_transaction_transaction_execute(caosdb_transaction_transaction *transaction), {
    auto *wrapped_transaction = auto *wrapped_transaction =
    static_cast<caosdb::transaction::Transaction *>(transaction->wrapped_transaction); static_cast<caosdb::transaction::Transaction *>(transaction->wrapped_transaction);
    ...@@ -479,7 +475,8 @@ ERROR_RETURN_CODE( ...@@ -479,7 +475,8 @@ ERROR_RETURN_CODE(
    return status.GetCode(); return status.GetCode();
    }) })
    ERROR_RETURN_CODE(GENERIC_ERROR, ERROR_RETURN_CODE(
    GENERIC_ERROR,
    int caosdb_transaction_transaction_get_result_set(caosdb_transaction_transaction *transaction, int caosdb_transaction_transaction_get_result_set(caosdb_transaction_transaction *transaction,
    caosdb_transaction_result_set *out), caosdb_transaction_result_set *out),
    { {
    ......
    ...@@ -455,33 +455,27 @@ TEST_F(test_ccaosdb, test_insert_update_delete) { ...@@ -455,33 +455,27 @@ TEST_F(test_ccaosdb, test_insert_update_delete) {
    caosdb_connection_connection_manager_get_default_connection(&connection); caosdb_connection_connection_manager_get_default_connection(&connection);
    caosdb_transaction_transaction insert_transaction; caosdb_transaction_transaction insert_transaction;
    caosdb_connection_connection_create_transaction(&connection, caosdb_connection_connection_create_transaction(&connection, &insert_transaction);
    &insert_transaction);
    caosdb_entity_entity entity; caosdb_entity_entity entity;
    caosdb_entity_create_entity(&entity); caosdb_entity_create_entity(&entity);
    caosdb_entity_entity_set_name(&entity, "some_name"); caosdb_entity_entity_set_name(&entity, "some_name");
    int return_code( int return_code(caosdb_transaction_transaction_insert_entity(&insert_transaction, &entity));
    caosdb_transaction_transaction_insert_entity(&insert_transaction, &entity));
    // For now, nothing further can be done here, so it should be READY // For now, nothing further can be done here, so it should be READY
    EXPECT_EQ(return_code, caosdb::StatusCode::READY); EXPECT_EQ(return_code, caosdb::StatusCode::READY);
    caosdb_transaction_transaction update_transaction; caosdb_transaction_transaction update_transaction;
    caosdb_connection_connection_create_transaction(&connection, caosdb_connection_connection_create_transaction(&connection, &update_transaction);
    &update_transaction);
    return_code = return_code = caosdb_transaction_transaction_update_entity(&update_transaction, &entity);
    caosdb_transaction_transaction_update_entity(&update_transaction, &entity);
    // No ID, so this should be an error // No ID, so this should be an error
    EXPECT_EQ(return_code, caosdb::StatusCode::ORIGINAL_ENTITY_MISSING_ID); EXPECT_EQ(return_code, caosdb::StatusCode::ORIGINAL_ENTITY_MISSING_ID);
    caosdb_transaction_transaction delete_transaction; caosdb_transaction_transaction delete_transaction;
    caosdb_connection_connection_create_transaction(&connection, caosdb_connection_connection_create_transaction(&connection, &delete_transaction);
    &delete_transaction);
    return_code = return_code = caosdb_transaction_transaction_delete_by_id(&delete_transaction, "some_id");
    caosdb_transaction_transaction_delete_by_id(&delete_transaction, "some_id");
    // Could add further deletions // Could add further deletions
    EXPECT_EQ(return_code, caosdb::StatusCode::GO_ON); EXPECT_EQ(return_code, caosdb::StatusCode::GO_ON);
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment