Add per column regex filtering

datatables/__init__.py

@@ -136,7 +136,8 @@ def yadcf_multi_select(expr, value):
     'yadcf_multi_select': yadcf_multi_select,
     'yadcf_range_number': yadcf_range_number,
     'yadcf_range_number_slider': yadcf_range_number,
-    'yadcf_range_date': yadcf_range_date
+    'yadcf_range_date': yadcf_range_date,
+    'regex': lambda expr, value, op: expr.op(op)(value)
 }
 
 
@@ -335,7 +336,10 @@ def _set_column_filter_expressions(self):
                 'columns[{:d}][search][value]'.format(i), '')
             if value:
                 search_func = search_methods[self.columns[i].search_method]
-                filter_expr = search_func(self.columns[i].sqla_expr, value)
+                if self.columns[i].search_method == 'regex':
+                    filter_expr = search_func(self.columns[i].sqla_expr, value, self._get_regex_operator())
+                else:
+                    filter_expr = search_func(self.columns[i].sqla_expr, value)
             self.filter_expressions.append(filter_expr)
 
     def _set_global_filter_expression(self):
@@ -348,7 +352,6 @@ def _set_global_filter_expression(self):
                 self.params.get('search[regex]') == 'true'):
             op = self._get_regex_operator()
             val = clean_regex(global_search)
-
             def filter_for(col):
                 return col.sqla_expr.op(op)(val)
         else:
@@ -398,7 +401,7 @@ def _get_regex_operator(self):
         if isinstance(
                 self.query.session.bind.dialect,
                 postgresql.dialect):
-            return '~'
+            return '~*'
         elif isinstance(
                 self.query.session.bind.dialect,
                 mysql.dialect):

tests/__init__.py

@@ -2,8 +2,9 @@
 import faker
 import unittest
 import itertools
+import re
 
-from sqlalchemy import create_engine
+from sqlalchemy import create_engine, event
 from sqlalchemy.orm import sessionmaker
 from datetime import datetime, timedelta
 
@@ -19,6 +20,9 @@ def setUpClass(cls):
         """Set up fake database session before all tests."""
         cls.engine = create_engine(
             'sqlite:///db.sqlite', echo=False)  # echo=True for debug
+
+        event.listen(cls.engine, 'begin', BaseTest.add_regex_on_connect)
+
         Base.metadata.create_all(cls.engine)
         Session = sessionmaker(bind=cls.engine)
         cls.session = Session()
@@ -27,6 +31,7 @@ def setUpClass(cls):
     @classmethod
     def tearDownClass(cls):
         """Tear down database session after all tests."""
+        event.remove(cls.engine, 'begin', BaseTest.add_regex_on_connect)
         Base.metadata.drop_all(cls.engine)
 
     @classmethod
@@ -74,3 +79,8 @@ def create_dt_params(
                 params['order[%s][%s]' % (i, key)] = str(value)
 
         return params
+
+    @classmethod
+    def add_regex_on_connect(cls, dbapi_con):
+        """Add REGEX functionality for sqlite"""
+        dbapi_con.connection.create_function("REGEXP", 2, lambda expr, item : re.search(expr, str(item)) is not None)

tests/models.py

@@ -17,7 +17,7 @@ class User(Base):
     __tablename__ = 'users'
 
     id = Column(Integer, primary_key=True)
-    name = Column(String, unique=True)
+    name = Column(String)
     created_at = Column(DateTime, default=datetime.datetime.utcnow)
     birthday = Column(Date)
     address = relationship('Address', uselist=False, backref=backref('user'))
@@ -48,7 +48,7 @@ class Address(Base):
     __tablename__ = 'addresses'
 
     id = Column(Integer, primary_key=True)
-    description = Column(String, unique=True)
+    description = Column(String)
     user_id = Column(Integer, ForeignKey('users.id'))
 
     def __unicode__(self):

tests/test_fields.py

@@ -45,7 +45,7 @@ def test_fields_search_filters(self):
         params['columns[0][search][value]'] = '=4'
         params['columns[1][search][value]'] = user.name
         params['columns[2][search][value]'] = '>1965-02-02'
-        params['columns[2][search][value]'] = '<=99'
+        params['columns[3][search][value]'] = '<=99'
         rowTable = DataTables(params, query, columns)
         res = rowTable.output_result()
 
@@ -141,14 +141,10 @@ def test_fields_global_search_filtering_with_regex(self):
             params, query, columns, allow_regex_searches=True)
         res = rowTable.output_result()
 
-        if 'error' in res:
-            # unfortunately sqlite doesn't support regexp out of the box'
-            assert 'no such function: REGEXP' in res['error']
-        else:
-            assert len(res['data']) == 1
-            assert res['recordsTotal'] == '1'
-            assert res['recordsFiltered'] == '1'
-            assert res['data'][0]['1'] == 'Feeeeear Of'
+        assert len(res['data']) == 1
+        assert res['recordsTotal'] == '52'
+        assert res['recordsFiltered'] == '1'
+        assert res['data'][0]['1'] == 'Feeeeear Of'
 
 
 class FieldsTest4(BaseTest):

tests/test_searching.py

@@ -25,6 +25,14 @@ def test_method_none(self):
             search_value='abc')
         assert res['recordsFiltered'] == '50'
 
+    def test_method_regex(self):
+        res = self.get_result(
+            column=User.name,
+            search_method='regex',
+            search_value='.*')
+
+        assert res['recordsFiltered'] == '50'
+
     def test_method_numeric(self):
         res = self.get_result(
             column=User.id,