Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-cpplib
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
caosdb-cpplib
Commits
667c0c77
Verified
Commit
667c0c77
authored
3 years ago
by
Timm Fitschen
Browse files
Options
Downloads
Plain Diff
Merge branch 'f-cpp-to-string' into f-mixed-write-transactions
parents
c6f19e13
e89fc870
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!26
F mixed write transactions
Pipeline
#13994
passed
3 years ago
Stage: info
Stage: setup
Stage: test
Stage: deploy
Pipeline: caosdb-cppinttest
#13997
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/ccaosdb.h
+1
-0
1 addition, 0 deletions
include/ccaosdb.h
src/ccaosdb.cpp
+8
-0
8 additions, 0 deletions
src/ccaosdb.cpp
test/test_ccaosdb.cpp
+3
-0
3 additions, 0 deletions
test/test_ccaosdb.cpp
with
12 additions
and
0 deletions
include/ccaosdb.h
+
1
−
0
View file @
667c0c77
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
src/ccaosdb.cpp
+
8
−
0
View file @
667c0c77
...
...
@@ -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
),
{
...
...
This diff is collapsed.
Click to expand it.
test/test_ccaosdb.cpp
+
3
−
0
View file @
667c0c77
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment