Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-advanced-user-tools
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-advanced-user-tools
Commits
9e2c6b31
Commit
9e2c6b31
authored
3 years ago
by
Henrik tom Wörden
Browse files
Options
Downloads
Plain Diff
Merge branch 'dev' into resulttable
parents
452d6f2c
bfa5a598
No related branches found
No related tags found
2 merge requests
!39
Release 0.4.0
,
!6
Resulttable
Pipeline
#14713
failed
3 years ago
Stage: setup
Stage: cert
Stage: style
Stage: unittest
Stage: integrationtest
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+1
-0
1 addition, 0 deletions
CHANGELOG.md
integrationtests/test_crawl_with_datamodel_problems.py
+2
-1
2 additions, 1 deletion
integrationtests/test_crawl_with_datamodel_problems.py
src/caosadvancedtools/crawler.py
+4
-3
4 additions, 3 deletions
src/caosadvancedtools/crawler.py
with
7 additions
and
4 deletions
CHANGELOG.md
+
1
−
0
View file @
9e2c6b31
...
@@ -60,6 +60,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
...
@@ -60,6 +60,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
*
Fixed an issue where
`caosadvancedtools.cache.UpdateCache`
would
*
Fixed an issue where
`caosadvancedtools.cache.UpdateCache`
would
cause an
`sqlite3.IntegrityError`
if more than one change was cached
cause an
`sqlite3.IntegrityError`
if more than one change was cached
for the same entity.
for the same entity.
*
#40 Insertion of identifiables with missing obligatory properties
### Security ###
### Security ###
...
...
This diff is collapsed.
Click to expand it.
integrationtests/test_crawl_with_datamodel_problems.py
+
2
−
1
View file @
9e2c6b31
...
@@ -89,5 +89,6 @@ def test_crawler_with_data_model_problems():
...
@@ -89,5 +89,6 @@ def test_crawler_with_data_model_problems():
# There should be datamodel problems
# There should be datamodel problems
assert
len
(
DataModelProblems
.
missing
)
>
0
assert
len
(
DataModelProblems
.
missing
)
>
0
# Deleted entities should have been identified:
# Deleted entities should have been identified:
assert
deleted_entities
.
issubset
(
DataModelProblems
.
missing
)
assert
DataModelProblems
.
missing
.
issubset
(
deleted_entities
)
This diff is collapsed.
Click to expand it.
src/caosadvancedtools/crawler.py
+
4
−
3
View file @
9e2c6b31
...
@@ -544,8 +544,8 @@ carefully and if the changes are ok, click on the following link:
...
@@ -544,8 +544,8 @@ carefully and if the changes are ok, click on the following link:
try
:
try
:
if
len
(
cfood
.
to_be_updated
)
>
0
:
if
len
(
cfood
.
to_be_updated
)
>
0
:
logger
.
info
(
logger
.
info
(
"
Updating {} Records...
"
.
format
(
"
Updating {} Records...
"
.
format
(
len
(
cfood
.
to_be_updated
)))
len
(
cfood
.
to_be_updated
)))
guard
.
safe_update
(
cfood
.
to_be_updated
,
unique
=
False
)
guard
.
safe_update
(
cfood
.
to_be_updated
,
unique
=
False
)
except
FileNotFoundError
as
e
:
except
FileNotFoundError
as
e
:
logger
.
info
(
"
Cannot access {}. However, it might be needed for
"
logger
.
info
(
"
Cannot access {}. However, it might be needed for
"
...
@@ -610,7 +610,8 @@ carefully and if the changes are ok, click on the following link:
...
@@ -610,7 +610,8 @@ carefully and if the changes are ok, click on the following link:
logger
.
info
(
logger
.
info
(
"
Inserting {} Records...
"
.
format
(
"
Inserting {} Records...
"
.
format
(
len
(
missing_identifiables
)))
len
(
missing_identifiables
)))
guard
.
safe_insert
(
missing_identifiables
,
unique
=
False
)
guard
.
safe_insert
(
missing_identifiables
,
unique
=
False
,
flags
=
{
"
force-missing-obligatory
"
:
"
ignore
"
})
except
Exception
as
e
:
except
Exception
as
e
:
DataModelProblems
.
evaluate_exception
(
e
)
DataModelProblems
.
evaluate_exception
(
e
)
...
...
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