datagrid 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d7cb9f6ca20bf850b830352d5acedd8b71c33cd344b27a2ad87ae6a9f78d58f
-  data.tar.gz: a6261913da93d1c8e1a875ff1b98efb907e015af43f03603ba4c40d48bca8c30
+  metadata.gz: f5ac6077bea5b3ee95001a94f7c862a2430dec10d5d35602ac763ad748b2bd6f
+  data.tar.gz: 86a7e62eebc8044e215708ce2aa29f63955e5c7c0635a4e48e1e41f35bffc291
 SHA512:
-  metadata.gz: 4e20609d434f571ba4fcec92f821fd2bf6a9e4995629fd0a3702562d3b2dbd06f647dbac9104cdf45d37a11b622e7d64012f160348493e0f70ab5972900e9a9b
-  data.tar.gz: e16a562a395b43cd36da74635ec61bc4b4c800f7b68d64e2e4dfd4713ac6c3bd9fe1b64d9ccb44ba03ae44dbb264c919a03c6e94f7e05f5fa9ae61ac4baa1bee
+  metadata.gz: 3f695cc908307c31ae745621b6afe99ef86422b685549d3084e9b5610c7420eea8c0de9318a25849f0e0042bdc0c95d11b6163ebf0d01ea1b4d62d6de8bd2b81
+  data.tar.gz: 3fe0c0cde94487679ec67ba563b8668f26fa4f977700a25ae58c35a1908bdc73d1558b83a4593eaaf51810844baa26e99e834f7a280edae01ad55f6bc83c3051

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [2.0.8]
+
+* Rescue StatementInvalid when guessing column type from a query
+* Prevent typecasting of date into timestamp when `:date` filter has a block
+
+``` ruby
+class MyGrid < Datagrid::Base
+  scope { User }
+
+  filter(:created_at, :date) do |scope, value|
+    value.is_a?(Date) # => true
+    scope.joins(:registration).where(registrations: { registration_date: value })
+  end
+end
+```
+
 ## [2.0.7]
 
 * Raise `Datagrid::ConfigurationError` when column or filter name 

data/lib/datagrid/drivers/active_record.rb

@@ -86,22 +86,32 @@ module Datagrid
         scope.where("#{field} #{contains_predicate} ?", "%#{value}%")
       end
 
+      def builtin_type(scope, field)
+        if scope_has_column?(scope, field)
+          scope.columns_hash[field.to_s].type
+        else
+          begin
+            scope.connection.select_all(
+              scope.unscope(:select, :order).select(field => "custom_field").limit(0).arel
+            ).column_types['custom_field']&.type
+          rescue ActiveRecord::StatementInvalid
+            nil
+          end
+        end
+      end
+
       def normalized_column_type(scope, field)
-        builtin_type = scope_has_column?(scope, field) ?
-          scope.columns_hash[field.to_s].type :
-          scope.connection.select_all(
-            scope.unscope(:select, :order).select(field => "custom_field").limit(0).arel
-          ).column_types['custom_field']&.type
-
-        {
-          %i[string text time binary] => :string,
-          %i[integer primary_key] => :integer,
-          %i[float decimal] => :float,
-          [:date] => :date,
-          %i[datetime timestamp timestamptz] => :timestamp,
-          [:boolean] => :boolean,
-        }.each do |keys, value|
-          return value if keys.include?(builtin_type)
+        if builtin_type = builtin_type(scope, field)
+          {
+            %i[string text time binary] => :string,
+            %i[integer primary_key] => :integer,
+            %i[float decimal] => :float,
+            [:date] => :date,
+            %i[datetime timestamp timestamptz] => :timestamp,
+            [:boolean] => :boolean,
+          }.each do |keys, value|
+            return value if keys.include?(builtin_type)
+          end
         end
         nil
       end

data/lib/datagrid/filters/base_filter.rb

@@ -23,7 +23,7 @@ module Datagrid
       end
 
       def parse(value)
-        raise NotImplementedError, "#parse(value) suppose to be overwritten"
+        raise NotImplementedError, "#{self.class}#parse(value) suppose to be overwritten"
       end
 
       def default_input_options

data/lib/datagrid/filters/date_filter.rb

@@ -12,7 +12,7 @@ module Datagrid
       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

data/lib/datagrid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Datagrid
-  VERSION = "2.0.7"
+  VERSION = "2.0.8"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Bogdan Gusiev
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -98,7 +97,6 @@ metadata:
   changelog_uri: https://github.com/bogdan/datagrid/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/bogdan/datagrid
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -113,8 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Library that provides DSL to present table like data
 test_files: []