Add tests on custom_field feature

Author: n-rodriguez

lib/ajax-datatables-rails/datatable/column.rb

@@ -36,11 +36,11 @@ def table
       end
 
       def model
-        @model ||= source.split('.').first.constantize
+        @model ||= custom_field? ? source : source.split('.').first.constantize
       end
 
       def field
-        @field ||= source.split('.').last.to_sym
+        @field ||= custom_field? ? source : source.split('.').last.to_sym
       end
 
       def custom_field?

lib/ajax-datatables-rails/datatable/column/search.rb

@@ -88,15 +88,11 @@ def null_value_search
         end
 
         def raw_search(cond)
-          if custom_field?
-            ::Arel::Nodes::SqlLiteral.new(field).eq(formatted_value)
-          else
-            table[field].send(cond, formatted_value)
-          end
+          table[field].send(cond, formatted_value) unless custom_field?
         end
 
         def text_search(value)
-          casted_column.matches(value)
+          casted_column.matches(value) unless custom_field?
         end
 
         def empty_search

spec/ajax-datatables-rails/orm/active_record_filter_records_spec.rb

@@ -410,12 +410,12 @@
           create(:user, first_name: 'phil', post_id: largest_postgresql_integer_value)
         end
 
-        it 'Returns an empty result if input value is too large' do
+        it 'returns an empty result if input value is too large' do
           datatable.params[:columns]['5'][:search][:value] = largest_postgresql_integer_value + 1
           expect(datatable.data.size).to eq 0
         end
 
-        it 'Returns an empty result if input value is too small' do
+        it 'returns an empty result if input value is too small' do
           datatable.params[:columns]['5'][:search][:value] = smallest_postgresql_integer_value - 1
           expect(datatable.data.size).to eq 0
         end
@@ -597,6 +597,28 @@
         }.to raise_error(AjaxDatatablesRails::Error::InvalidSearchCondition).with_message('foo')
       end
     end
+
+    context 'custom column' do
+      describe 'it can filter records with custom column' do
+        let(:datatable) { DatatableCustomColumn.new(sample_params) }
+
+        before do
+          create(:user, username: 'msmith',  email: '[email protected]', first_name: 'Mary', last_name: 'Smith')
+          create(:user, username: 'jsmith',  email: '[email protected]', first_name: 'John', last_name: 'Smith')
+          create(:user, username: 'johndoe', email: '[email protected]',    first_name: 'John', last_name: 'Doe')
+        end
+
+        it 'filters records' do
+          skip('unsupported database adapter') if RunningSpec.oracle? || RunningSpec.sqlite?
+
+          datatable.params[:columns]['4'][:search][:value] = 'John'
+          datatable.params[:order]['0'][:column] = '4'
+          expect(datatable.data.size).to eq 2
+          item = datatable.data.first
+          expect(item[:full_name]).to eq 'John Doe'
+        end
+      end
+    end
   end
 
   describe 'formatter option' do

spec/support/datatables/datatable_custom_column.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class DatatableCustomColumn < ComplexDatatable
+  def view_columns
+    super.deep_merge(full_name: { cond: filter_full_name })
+  end
+
+  def get_raw_records
+    User.select("*, CONCAT(first_name, ' ', last_name) as full_name")
+  end
+
+  private
+
+  def filter_full_name
+    ->(_column, value) { ::Arel::Nodes::SqlLiteral.new("CONCAT(first_name, ' ', last_name)").matches("#{value}%") }
+  end
+end