Skip to content

[LIB-743] add string field lookups #198

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
opalczynski merged 2 commits into from
Jun 1, 2016
Merged

[LIB-743] add string field lookups #198

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f20f47
[LIB-743] Add string field filtering
opalczynski May 25, 2016
12a61a0
[LIB-743] corrects after tests
opalczynski May 25, 2016
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
Prev Previous commit
[LIB-743] corrects after tests
  • Loading branch information
@opalczynski
opalczynski committed May 25, 2016
commit 12a61a0d40b1fcd302233ee0e2c1e608c4a751cd
9 changes: 6 additions & 3 deletions syncano/models/manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,6 +884,10 @@ class for :class:`~syncano.models.base.Object` model.
'gt', 'gte', 'lt', 'lte',
'eq', 'neq', 'exists', 'in',
'near', 'is', 'contains',
'startswith', 'endswith',
'contains', 'istartswith',
'iendswith', 'icontains',
'ieq', 'near',
]

def __init__(self):
Expand Down Expand Up @@ -990,13 +994,12 @@ def _get_lookup_attributes(self, field_name):
return model_name, field_name, lookup

def _validate_lookup(self, model, model_name, field_name, lookup, field):

if not model_name and field_name not in model._meta.field_names:
allowed = ', '.join(model._meta.field_names)
raise SyncanoValueError('Invalid field name "{0}" allowed are {1}.'.format(field_name, allowed))

allowed_lookups = set(self.ALLOWED_LOOKUPS + field.field_lookups)

if lookup not in allowed_lookups:
if lookup not in self.ALLOWED_LOOKUPS:
allowed = ', '.join(self.ALLOWED_LOOKUPS)
raise SyncanoValueError('Invalid lookup type "{0}" allowed are {1}.'.format(lookup, allowed))

Expand Down
2 changes: 1 addition & 1 deletion tests/integration_test_string_filtering.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def _test_filter(self, filter):

def test_starstwith(self):
self._test_filter({'title__startswith': 'Some'})
self._test_filter({'title__istartswith': 'omes'})
self._test_filter({'title__istartswith': 'some'})

def test_endswith(self):
self._test_filter({'title__endswith': 'tle'})
Expand Down