Skip to content

Commit

Permalink
Fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
JohannesLichtenberger committed Jul 10, 2024
2 parents 12bff40 + 4ed6a0d commit 798892e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion pysirix/json_store.py
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ def delete_records(self, query_dict: Dict) -> Union[str, Awaitable[str]]:
f"{query_function_include}"
f"let $doc := jn:doc('{self.db_name}','{self.name}'){self.root}"
f" let $m := for $i at $pos in $doc where local:q($i, {stringify(query_dict)}) return $pos - 1"
" for $i in $m order by $i descending return delete json $doc[[$i]]"
" for $i in $m order by $i descending return delete json $doc[$i]"
)
return self._client.post_query({"query": query})

Expand Down
12 changes: 6 additions & 6 deletions requirements-all.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,29 @@ anyio==3.3.4
atomicwrites==1.4.0
attrs==21.2.0
Babel==2.9.1
certifi==2021.10.8
certifi==2022.12.7
charset-normalizer==2.0.7
colorama==0.4.4
coverage==6.1.2
docutils==0.17.1
h11==0.12.0
httpcore==0.15.0
httpx==0.23.0
idna==3.3
idna==3.7
imagesize==1.3.0
iniconfig==1.1.1
Jinja2==3.0.3
Jinja2==3.1.4
MarkupSafe==2.0.1
packaging==21.2
pluggy==1.0.0
py==1.11.0
Pygments==2.10.0
Pygments==2.15.0
pyparsing==2.4.7
pytest==6.2.5
pytest-asyncio==0.16.0
pytest-cov==3.0.0
pytz==2021.3
requests==2.26.0
requests==2.31.0
rfc3986==1.5.0
sniffio==1.2.0
snowballstemmer==2.2.0
Expand All @@ -39,4 +39,4 @@ sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.5
toml==0.10.2
tomli==1.2.2
urllib3==1.26.7
urllib3==1.26.19
4 changes: 2 additions & 2 deletions tests/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"baz": "hello",
"tada": [{"foo": "bar"}, {"baz": False}, "boo", {}, []],
}
post_query = """let $nodeKey := sdb:nodekey(jn:doc('Query','query_resource1').foo[[2]])
post_query = """let $nodeKey := sdb:nodekey(jn:doc('Query','query_resource1').foo[2])
return $nodeKey"""

resource_query = """let $nodeKey := sdb:nodekey($$.foo[[2]])
resource_query = """let $nodeKey := sdb:nodekey($$.foo[2])
return $nodeKey"""

0 comments on commit 798892e

Please sign in to comment.