speedup CONTAINS when un-necessary REPLACE

VERSION

@@ -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

@@ -1257,11 +1257,20 @@ class BaseAdapter(ConnectionPool):
 
     def CONTAINS(self,first,second,case_sensitive=False):        
         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:'):
-            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
         return op(first,second)
 

gluon/tools.py

@@ -1792,6 +1792,7 @@ class Auth(object):
                 keys['first_name'] = keys.get('username', guess)
             user_id = table_user.insert(**table_user._filter_fields(keys))
             user = self.user = table_user[user_id]            
+            print user
             if self.settings.create_user_groups:
                 group_id = self.add_group(
                     self.settings.create_user_groups % user)