Skip to content

🐛 Fix json_extract Construction #772

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 4 commits into from
Feb 2, 2024
Merged

🐛 Fix json_extract Construction #772

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a761733
fix json_extract construction
measty Jan 20, 2024
a8096e5
fix integer property case
measty Jan 20, 2024
656110e
add test for key containing a .
measty Jan 27, 2024
7003504
Merge branch 'develop' into dsl-props-fix
measty Jan 27, 2024
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
4 changes: 2 additions & 2 deletions tests/test_dsl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ def test_prop_or_prop() -> None:
{},
)
assert str(query) == (
'((json_extract(properties, "$.int") == 2) OR '
'(json_extract(properties, "$.int") == 3))'
"""((json_extract(properties, '$."int"') == 2) OR """
"""(json_extract(properties, '$."int"') == 3))"""
)


Expand Down
6 changes: 3 additions & 3 deletions tiatoolbox/annotation/dsl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,14 +265,14 @@ def __init__(self: SQLJSONDictionary, acc: str | None = None) -> None:

def __str__(self: SQLJSONDictionary) -> str:
"""Return a human-readable, or informal, string representation of an object."""
return f"json_extract(properties, {json.dumps(f'$.{self.acc}')})"
return f"json_extract(properties, '$.{self.acc}')"

def __getitem__(self: SQLJSONDictionary, key: str) -> SQLJSONDictionary:
"""Get an item from the dataset."""
key_str = f"[{key}]" if isinstance(key, (int,)) else str(key)
key_str = f"[{key}]" if isinstance(key, (int,)) else f'"{key}"'

joiner = "." if self.acc and not isinstance(key, int) else ""
return SQLJSONDictionary(acc=self.acc + joiner + f"{key_str}")
return SQLJSONDictionary(acc=self.acc + joiner + key_str)

def get(
self: SQLJSONDictionary,
Expand Down