Skip to content
Snippets Groups Projects
Verified Commit 667c0c77 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Merge branch 'f-cpp-to-string' into f-mixed-write-transactions

parents c6f19e13 e89fc870
No related branches found
No related tags found
1 merge request!26F mixed write transactions
Pipeline #13994 passed
Pipeline: caosdb-cppinttest

#13997

    ......@@ -412,6 +412,7 @@ int caosdb_entity_parent_get_description(caosdb_entity_parent *parent, char **ou
    int caosdb_entity_message_get_code(caosdb_entity_message *message, int *out);
    int caosdb_entity_message_get_description(caosdb_entity_message *message, char **out);
    int caosdb_entity_datatype_is_undefined(caosdb_entity_datatype *datatype, bool *out);
    int caosdb_entity_datatype_is_atomic(caosdb_entity_datatype *datatype, bool *out);
    int caosdb_entity_datatype_is_reference(caosdb_entity_datatype *datatype, bool *out);
    int caosdb_entity_datatype_is_list_of_atomic(caosdb_entity_datatype *datatype, bool *out);
    ......
    ......@@ -991,6 +991,14 @@ ERROR_RETURN_CODE(
    return 0;
    })
    ERROR_RETURN_CODE(GENERIC_ERROR,
    int caosdb_entity_datatype_is_undefined(caosdb_entity_datatype *datatype,
    bool *out),
    {
    auto *wrapped_datatype = WRAPPED_DATATYPE_CAST(datatype);
    *out = wrapped_datatype->IsUndefined();
    return 0;
    })
    ERROR_RETURN_CODE(GENERIC_ERROR,
    int caosdb_entity_datatype_is_atomic(caosdb_entity_datatype *datatype, bool *out),
    {
    ......
    ......@@ -150,6 +150,9 @@ TEST_F(test_ccaosdb, test_datatype) {
    EXPECT_EQ(return_code, 0);
    bool is_a(false);
    return_code = caosdb_entity_datatype_is_undefined(&atomic, &is_a);
    EXPECT_EQ(return_code, 0);
    EXPECT_FALSE(is_a);
    return_code = caosdb_entity_datatype_is_atomic(&atomic, &is_a);
    EXPECT_EQ(return_code, 0);
    EXPECT_TRUE(is_a);
    ......
    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