Avoid type casting date to timestamp when custom filter block is used

Author: bogdan

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## [2.0.8]
 
+* Prevent typecasting of date into timestamp when `:date` filter has a block
 * Rescue StatementInvalid when guessing column type from a query
 
 ## [2.0.7]

lib/datagrid/filters/date_filter.rb

@@ -12,7 +12,7 @@ def default_input_options
       end
 
       def apply(grid_object, scope, value)
-        if !dummy? && grid_object.driver.timestamp_column?(scope, name)
+        if !dummy? && !block && grid_object.driver.timestamp_column?(scope, name)
           value = Datagrid::Utils.format_date_as_timestamp(value)
         end
         super

spec/datagrid/filters/date_filter_spec.rb

@@ -187,7 +187,7 @@ def not_include_entry(date)
     time = Time.utc(2018, 0o1, 0o7, 2, 2)
 
     report = test_grid_filter(:created_at, :date, range: true) do |value|
-      where(created_at: value)
+      where(created_at: value.begin&.beginning_of_day..value.end&.end_of_day)
     end
     report.created_at = date
 
@@ -287,4 +287,18 @@ class ChildGrid < ParentGrid
       test_grid_filter(:created_at, :date, range: true, default: 3.day.ago..Time.now).created_at,
     ).to eq(3.days.ago.to_date..Date.today)
   end
+
+  it "doesn't convert to timestamp if block is given" do
+    grid = test_grid_filter(:created_at, :date) do |value, scope|
+      scope.where(created_at: (value - 5.minutes)..(value + 5.minutes))
+    end
+
+    time = Time.now
+    grid.created_at = time
+    e1 = Entry.create!(created_at: time.beginning_of_day)
+    e2 = Entry.create!(created_at: time)
+
+    expect(grid.assets).to include(e1)
+    expect(grid.assets).to_not include(e2)
+  end
 end