dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support for in and not in smart_query

Browse Source
This commit is contained in:
mdipierro
2012-12-03 08:15:58 -06:00
parent 6ced9dd235
commit 0e93162080
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.2.1 (2012-12-02 08:26:35) stable Version 2.2.1 (2012-12-03 08:15:18) stable
gluon/dal.py
+5 -1
View File
@@ -6566,11 +6566,13 @@ def smart_query(fields,text):
(' not equal ','!='), (' not equal ','!='),
(' equal to ','='), (' equal to ','='),
(' equal ','='), (' equal ','='),
(' equals ','!='), (' equals ','='),
(' less than ','<'), (' less than ','<'),
(' greater than ','>'), (' greater than ','>'),
(' starts with ','startswith'), (' starts with ','startswith'),
(' ends with ','endswith'), (' ends with ','endswith'),
(' not in ' , 'notbelongs'),
(' in ' , 'belongs'),
(' is ','=')]: (' is ','=')]:
if a[0]==' ': if a[0]==' ':
text = text.replace(' is'+a,' %s ' % b) text = text.replace(' is'+a,' %s ' % b)
@@ -6605,6 +6607,8 @@ def smart_query(fields,text):
elif op == '<=': new_query = field<=value elif op == '<=': new_query = field<=value
elif op == '>=': new_query = field>=value elif op == '>=': new_query = field>=value
elif op == '!=': new_query = field!=value elif op == '!=': new_query = field!=value
elif op == 'belongs': new_query = field.belongs(value.split(','))
elif op == 'notbelongs': new_query = ~field.belongs(value.split(','))
elif field.type in ('text','string'): elif field.type in ('text','string'):
if op == 'contains': new_query = field.contains(value) if op == 'contains': new_query = field.contains(value)
elif op == 'like': new_query = field.like(value) elif op == 'like': new_query = field.like(value)
gluon/sqlhtml.py
+6 -6
View File
@@ -1561,15 +1561,15 @@ class SQLFORM(FORM):
def search_menu(fields, search_options=None): def search_menu(fields, search_options=None):
T = current.T T = current.T
search_options = search_options or { search_options = search_options or {
'string': ['=', '!=', '<', '>', '<=', '>=', 'starts with', 'contains'], 'string': ['=', '!=', '<', '>', '<=', '>=', 'starts with', 'contains', 'in', 'not in'],
'text': ['=', '!=', '<', '>', '<=', '>=', 'starts with', 'contains'], 'text': ['=', '!=', '<', '>', '<=', '>=', 'starts with', 'contains', 'in', 'not in'],
'date': ['=', '!=', '<', '>', '<=', '>='], 'date': ['=', '!=', '<', '>', '<=', '>='],
'time': ['=', '!=', '<', '>', '<=', '>='], 'time': ['=', '!=', '<', '>', '<=', '>='],
'datetime': ['=', '!=', '<', '>', '<=', '>='], 'datetime': ['=', '!=', '<', '>', '<=', '>='],
'integer': ['=', '!=', '<', '>', '<=', '>='], 'integer': ['=', '!=', '<', '>', '<=', '>=', 'in', 'not in'],
'double': ['=', '!=', '<', '>', '<=', '>='], 'double': ['=', '!=', '<', '>', '<=', '>='],
'id': ['=', '!=', '<', '>', '<=', '>='], 'id': ['=', '!=', '<', '>', '<=', '>=', 'in', 'not in'],
'reference': ['=', '!=', '<', '>', '<=', '>='], 'reference': ['=', '!=', '<', '>', '<=', '>=', 'in', 'not in'],
'boolean': ['=', '!=']} 'boolean': ['=', '!=']}
if fields[0]._db._adapter.dbengine == 'google:datastore': if fields[0]._db._adapter.dbengine == 'google:datastore':
search_options['string'] = ['=', '!=', '<', '>', '<=', '>='] search_options['string'] = ['=', '!=', '<', '>', '<=', '>=']
@@ -2343,7 +2343,7 @@ class SQLFORM(FORM):
table: pagination, search, view, edit, delete, table: pagination, search, view, edit, delete,
children, parent, etc. children, parent, etc.
constraints is a dict {'table',query} that limits which constraints is a dict {'table':query} that limits which
records can be accessible records can be accessible
links is a dict like links is a dict like
{'tablename':[lambda row: A(....), ...]} {'tablename':[lambda row: A(....), ...]}