fixed sqlite regex

This commit is contained in:
Massimo DiPierro
2012-02-28 10:18:23 -06:00
parent 56df5c7d19
commit 45b4d2f853
2 changed files with 9 additions and 2 deletions

View File

@@ -1 +1 @@
Version 1.99.4 (2012-02-28 10:10:28) stable
Version 1.99.4 (2012-02-28 10:18:22) stable

View File

@@ -1693,6 +1693,10 @@ class SQLiteAdapter(BaseAdapter):
except:
return None
@staticmethod
def web2py_regexp(expression, item):
return re.compile(expression).search(item) is not None
def __init__(self, db, uri, pool_size=0, folder=None, db_codec ='UTF-8',
credential_decoder=lambda x:x, driver_args={},
adapter_args={}):
@@ -1719,7 +1723,10 @@ class SQLiteAdapter(BaseAdapter):
def connect(dbpath=dbpath, driver_args=driver_args):
return self.driver.Connection(dbpath, **driver_args)
self.pool_connection(connect)
self.connection.create_function('web2py_extract', 2, SQLiteAdapter.web2py_extract)
self.connection.create_function('web2py_extract', 2,
SQLiteAdapter.web2py_extract)
self.connection.create_function("REGEXP", 2,
SQLiteAdapter.web2py_regexp)
def _truncate(self, table, mode=''):
tablename = table._tablename