Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
CaosDB Crawler
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 Crawler
Commits
e94e7977
Commit
e94e7977
authored
2 years ago
by
Henrik tom Wörden
Browse files
Options
Downloads
Patches
Plain Diff
MAINT: accept strip of query string; test boolean values
parent
06a1c956
No related branches found
No related tags found
1 merge request
!77
MAINT: refactor converters and structure elements
Pipeline
#33316
failed
2 years ago
Stage: info
Stage: setup
Stage: cert
Stage: style
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/caoscrawler/identifiable_adapters.py
+1
-5
1 addition, 5 deletions
src/caoscrawler/identifiable_adapters.py
unittests/test_identifiable_adapters.py
+3
-3
3 additions, 3 deletions
unittests/test_identifiable_adapters.py
with
4 additions
and
8 deletions
src/caoscrawler/identifiable_adapters.py
+
1
−
5
View file @
e94e7977
...
@@ -60,11 +60,7 @@ def convert_value(value):
...
@@ -60,11 +60,7 @@ def convert_value(value):
# replace single quotes, otherwise they may break the queries
# replace single quotes, otherwise they may break the queries
return
value
.
replace
(
"
\'
"
,
"
\\
'"
)
return
value
.
replace
(
"
\'
"
,
"
\\
'"
)
else
:
else
:
# TODO: check whether this here is needed:
return
str
(
value
).
strip
()
# TODO: added strip, because whitespace is ignored by CaosDB anyways at the
# boundaries of the string
# return str(value).strip()
return
f
"
{
value
}
"
class
IdentifiableAdapter
(
metaclass
=
ABCMeta
):
class
IdentifiableAdapter
(
metaclass
=
ABCMeta
):
...
...
This diff is collapsed.
Click to expand it.
unittests/test_identifiable_adapters.py
+
3
−
3
View file @
e94e7977
...
@@ -50,9 +50,9 @@ def test_create_query_for_identifiable():
...
@@ -50,9 +50,9 @@ def test_create_query_for_identifiable():
"
h
"
:
db
.
Record
(
id
=
1111
),
"
h
"
:
db
.
Record
(
id
=
1111
),
"
i
"
:
db
.
File
(
id
=
1112
),
"
i
"
:
db
.
File
(
id
=
1112
),
"
j
"
:
[
2222
,
db
.
Record
(
id
=
3333
)]}))
"
j
"
:
[
2222
,
db
.
Record
(
id
=
3333
)]}))
assert
(
query
.
lower
()
==
"
find record b with
name=
'
a
'
and
'
c
'
=
'
c
'
and
'
d
'
=
'
5
'
and
'
e
'
=
'
5.5
'"
assert
(
query
==
"
FIND RECORD B WITH
name=
'
A
'
AND
'
c
'
=
'
c
'
AND
'
d
'
=
'
5
'
AND
'
e
'
=
'
5.5
'"
"
and
'
f
'
=
'
2020-10-10
t
00:00:00
'
and
'
g
'
=
'
true
'
and
'
h
'
=
'
1111
'
and
'
i
'
=
'
1112
'
and
"
"
AND
'
f
'
=
'
2020-10-10
T
00:00:00
'
AND
'
g
'
=
'
TRUE
'
AND
'
h
'
=
'
1111
'
AND
'
i
'
=
'
1112
'
AND
"
"'
j
'
=
'
2222
'
and
'
j
'
=
'
3333
'
"
)
"'
j
'
=
'
2222
'
AND
'
j
'
=
'
3333
'
"
)
# The name can be the only identifiable
# The name can be the only identifiable
query
=
IdentifiableAdapter
.
create_query_for_identifiable
(
query
=
IdentifiableAdapter
.
create_query_for_identifiable
(
...
...
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