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

🔙 from #921 - Fix explode_expression #923

Merged
merged 1 commit into from
Aug 2, 2024
Merged

🔙 from #921 - Fix explode_expression #923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 54 additions & 0 deletions g3w-admin/qdjango/tests/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,6 +696,60 @@ def test_explode_expression(self):
self.assertTrue('referencing_fields' in ee)
self.assertEqual(ee['referencing_fields'].sort(), expected['referencing_fields'].sort())

# Test current_value with spaces before '(' after 'current_value'
expr = "sqrt( $area ) *2 + \"gid\" + current_value ( \'doublespace\' )"

expected = {
'expression': expr,
'referenced_columns': ['gid', 'doublespace'],
'referenced_functions': ['sqrt', '$area', 'current_value'],
'referencing_fields': ['doublespace']
}

ee = explode_expression(expr)

self.assertEqual(ee['expression'], expected['expression'])
self.assertEqual(ee['referenced_columns'].sort(), expected['referenced_columns'].sort())
self.assertEqual(ee['referenced_functions'].sort(), expected['referenced_functions'].sort())
self.assertTrue('referencing_fields' in ee)
self.assertEqual(ee['referencing_fields'].sort(), expected['referencing_fields'].sort())

# Test current_value with spaces before '(' after 'current_value'
expr = "sqrt( $area ) *2 + \"gid\" + current_value ( \'doublespace\' )"

expected = {
'expression': expr,
'referenced_columns': ['gid', 'doublespace'],
'referenced_functions': ['sqrt', '$area', 'current_value'],
'referencing_fields': ['doublespace']
}

ee = explode_expression(expr)

self.assertEqual(ee['expression'], expected['expression'])
self.assertEqual(ee['referenced_columns'].sort(), expected['referenced_columns'].sort())
self.assertEqual(ee['referenced_functions'].sort(), expected['referenced_functions'].sort())
self.assertTrue('referencing_fields' in ee)
self.assertEqual(ee['referencing_fields'].sort(), expected['referencing_fields'].sort())

# Test current_value
expr = "sqrt( $area ) *2 + \"gid\" + current_value ( 'doublespace' )"

expected = {
'expression': expr,
'referenced_columns': ['gid', 'doublespace'],
'referenced_functions': ['sqrt', '$area', 'current_value'],
'referencing_fields': ['doublespace']
}

ee = explode_expression(expr)

self.assertEqual(ee['expression'], expected['expression'])
self.assertEqual(ee['referenced_columns'].sort(), expected['referenced_columns'].sort())
self.assertEqual(ee['referenced_functions'].sort(), expected['referenced_functions'].sort())
self.assertTrue('referencing_fields' in ee)
self.assertEqual(ee['referencing_fields'].sort(), expected['referencing_fields'].sort())

def test_expression_default_api_layer_config(self):
"""
Test Layer API REST config with expression default value
Expand Down
3 changes: 2 additions & 1 deletion g3w-admin/qdjango/utils/qgis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ def explode_expression(expression):

# For current_values function in filter expression get parameter field fo it
if "current_value" in filter_expression['referenced_functions']:
groups = re.findall(r'current_value\([^\S]?[\'"](.*?)["\'][^\S]?\)|(\w+=\w+)', filter_expression['expression'])
groups = re.findall(r'current_value[^\S]*\([^\S]?[\'"|\\\'](.*?)["\'|\\\'][^\S]?\)|(\w+=\w+)',
filter_expression['expression'])
filter_expression['referencing_fields'] = [g[0] for g in groups]

return filter_expression
Loading