Skip to content

fix: build_filter_conditions utils method #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 31, 2023
Merged

fix: build_filter_conditions utils method #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75d7d7a
initial commit (new test should fail)
aMahanna Aug 30, 2023
3b048b5
fix: build_filter_conditions
aMahanna Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions arango/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"is_none_or_str",
]

import json
import logging
from contextlib import contextmanager
from typing import Any, Iterator, Sequence, Union
Expand Down Expand Up @@ -119,11 +120,5 @@ def build_filter_conditions(filters: Json) -> str:
if not filters:
return ""

def format_condition(key: str, value: Any) -> str:
if isinstance(value, str):
return f'doc.{key} == "{value}"'

return f"doc.{key} == {value}"

conditions = [format_condition(k, v) for k, v in filters.items()]
conditions = [f"doc.{k} == {json.dumps(v)}" for k, v in filters.items()]
return "FILTER " + " AND ".join(conditions)
6 changes: 6 additions & 0 deletions tests/test_document.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1175,6 +1175,12 @@ def test_document_find(col, bad_col, docs):
assert len(found) == 1
assert found[0]["_key"] == "1"

# Test find with dict value with None
data = {"dict": {"foo": "bar", "foo_2": None}}
col.insert(data)
found = list(col.find(data))
assert len(found) == 1

# Test find with multiple conditions
found = list(col.find({"val": 2, "text": "foo"}))
assert len(found) == 1
Expand Down