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
0115f88b
Commit
0115f88b
authored
3 years ago
by
Henrik tom Wörden
Browse files
Options
Downloads
Plain Diff
Merge branch 'dev' into f-full-c
parents
7cab60be
76366852
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!15
ENH: Allow insert/update/delete and files in Extern C
Pipeline
#12417
passed
3 years ago
Stage: info
Stage: setup
Stage: test
Stage: deploy
Pipeline: caosdb-cppinttest
#12422
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/caosdb/transaction.h
+4
-2
4 additions, 2 deletions
include/caosdb/transaction.h
test/test_ccaosdb.cpp
+6
-0
6 additions, 0 deletions
test/test_ccaosdb.cpp
with
10 additions
and
2 deletions
include/caosdb/transaction.h
+
4
−
2
View file @
0115f88b
...
...
@@ -345,7 +345,8 @@ public:
*
* A client may request the current status at any time via GetStatus().
*
* Use WaitForIt() to join the back-ground execution of this transaction.
* Use WaitForIt() to join the back-ground execution of this transaction, otherwise the behaviour
* of getting the ResultSet is undefined.
*/
auto
ExecuteAsynchronously
()
noexcept
->
StatusCode
;
...
...
@@ -353,7 +354,8 @@ public:
* Join the background execution and return the status when the execution
* terminates.
*
* Use this after ExecuteAsynchronously().
* Use this after ExecuteAsynchronously(), otherwise the TransactionStatus still remains
* EXECUTING.
*/
[[
nodiscard
]]
auto
WaitForIt
()
const
noexcept
->
TransactionStatus
;
...
...
This diff is collapsed.
Click to expand it.
test/test_ccaosdb.cpp
+
6
−
0
View file @
0115f88b
...
...
@@ -172,6 +172,12 @@ TEST_F(test_ccaosdb, test_entity) {
EXPECT_FALSE
(
*
is_list
);
EXPECT_FALSE
(
*
is_ref
);
caosdb_entity_entity_set_datatype
(
&
entity
,
"Person"
,
true
,
true
);
caosdb_entity_entity_get_datatype
(
&
entity
,
&
out
,
is_ref
,
is_list
);
EXPECT_EQ
(
strcmp
(
out
,
"Person"
),
0
);
EXPECT_TRUE
(
*
is_list
);
EXPECT_TRUE
(
*
is_ref
);
caosdb_entity_entity_set_unit
(
&
entity
,
"m"
);
caosdb_entity_entity_get_unit
(
&
entity
,
&
out
);
EXPECT_EQ
(
strcmp
(
out
,
"m"
),
0
);
...
...
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