Skip to content
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

case search "date_add" function #31388

Merged
merged 12 commits into from
Apr 5, 2022
Merged

case search "date_add" function #31388

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
86a5a1c
support unwrapping of basic types
snopoke Apr 1, 2022
07167ad
rename var
snopoke Apr 1, 2022
f0b26f8
extract value_to_date function
snopoke Apr 1, 2022
b70885b
use constant
snopoke Apr 1, 2022
730155d
date_add case search value function
snopoke Apr 1, 2022
08adcfd
additional test cases
snopoke Apr 1, 2022
4729425
add date_add function to function list
snopoke Apr 1, 2022
02a81f0
Merge branch 'master' into sk/date_add
snopoke Apr 4, 2022
9fb8d04
rename var to avoid shadowing
snopoke Apr 4, 2022
72f84b4
Revert "support unwrapping of basic types"
snopoke Apr 5, 2022
e32c951
update validation messages
snopoke Apr 5, 2022
3c448f5
validate quantity type for 'years' and 'months'
snopoke Apr 5, 2022
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
2 changes: 2 additions & 0 deletions corehq/apps/case_search/dsl_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
def unwrap_value(domain, node):
"""Returns the value of the node if it is wrapped in a function, otherwise just returns the node
"""
if isinstance(node, (str, int, float, bool)):
return node
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Curious what this achieves that the if not isinstance(node, FunctionCall) line doesn't catch?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. What I was wanting to do was only permit certain types here. For example it should not return a BinaryExpression. But on more reflection perhaps that doesn't belong here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

72f84b4

if isinstance(node, UnaryExpression) and node.op == '-':
return -1 * node.right
if not isinstance(node, FunctionCall):
Expand Down