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
7cab60be
Commit
7cab60be
authored
3 years ago
by
florian
Browse files
Options
Downloads
Patches
Plain Diff
STY: autoformatted
parent
a3a181a9
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
#12335
passed
3 years ago
Stage: info
Stage: setup
Stage: test
Stage: deploy
Pipeline: caosdb-cppinttest
#12337
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/ccaosdb.h
+6
-6
6 additions, 6 deletions
include/ccaosdb.h
src/ccaosdb.cpp
+16
-19
16 additions, 19 deletions
src/ccaosdb.cpp
test/test_ccaosdb.cpp
+6
-12
6 additions, 12 deletions
test/test_ccaosdb.cpp
with
28 additions
and
37 deletions
include/ccaosdb.h
+
6
−
6
View file @
7cab60be
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
src/ccaosdb.cpp
+
16
−
19
View file @
7cab60be
...
...
@@ -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
),
{
...
...
This diff is collapsed.
Click to expand it.
test/test_ccaosdb.cpp
+
6
−
12
View file @
7cab60be
...
...
@@ -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
);
...
...
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