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

speedup CONTAINS when un-necessary REPLACE

Browse Source
This commit is contained in:
mdipierro
2013-06-24 14:24:36 -05:00
parent 51e510e30f
commit 7564f5f671
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.5.1-stable+timestamp.2013.06.24.02.06.34 Version 2.5.1-stable+timestamp.2013.06.24.14.23.41
gluon/dal.py
+14 -5
View File
@@ -1255,13 +1255,22 @@ class BaseAdapter(ConnectionPool):
return '(%s LIKE %s)' % (self.expand(first), return '(%s LIKE %s)' % (self.expand(first),
self.expand('%'+second, 'string')) self.expand('%'+second, 'string'))
def CONTAINS(self,first,second,case_sensitive=False): def CONTAINS(self,first,second,case_sensitive=False):
if first.type in ('string','text', 'json'): if first.type in ('string','text', 'json'):
second = Expression(None,self.CONCAT('%',Expression( if isinstance(second,Expression):
None,self.REPLACE(second,('%','%%'))),'%')) second = Expression(None,self.CONCAT('%',Expression(
None,self.REPLACE(second,('%','%%'))),'%'))
else:
second = '%'+str(second).replace('%','%%')+'%'
elif first.type.startswith('list:'): elif first.type.startswith('list:'):
second = Expression(None,self.CONCAT('%|',Expression(None,self.REPLACE( if isinstance(second,Expression):
Expression(None,self.REPLACE(second,('%','%%'))),('|','||'))),'|%')) second = Expression(None,self.CONCAT(
'%|',Expression(None,self.REPLACE(
Expression(None,self.REPLACE(
second,('%','%%'))),('|','||'))),'|%'))
else:
second = '%|'+str(second).replace('%','%%')\
.replace('|','||')+'|%'
op = case_sensitive and self.LIKE or self.ILIKE op = case_sensitive and self.LIKE or self.ILIKE
return op(first,second) return op(first,second)
gluon/tools.py
+2 -1
View File
@@ -1791,7 +1791,8 @@ class Auth(object):
guess = keys.get('email', 'anonymous').split('@')[0] guess = keys.get('email', 'anonymous').split('@')[0]
keys['first_name'] = keys.get('username', guess) keys['first_name'] = keys.get('username', guess)
user_id = table_user.insert(**table_user._filter_fields(keys)) user_id = table_user.insert(**table_user._filter_fields(keys))
user = self.user = table_user[user_id] user = self.user = table_user[user_id]
print user
if self.settings.create_user_groups: if self.settings.create_user_groups:
group_id = self.add_group( group_id = self.add_group(
self.settings.create_user_groups % user) self.settings.create_user_groups % user)