effective_resources 2.27.4 → 2.27.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c145b2d2dbce455fd6a9f01184ee346b07260a6cf846bd3c8f1f74843dc859d
-  data.tar.gz: 3817b969c1e5c4043401c577c7e5d7fc9c9328604660f21b3c8668e4b422d0d0
+  metadata.gz: 5c1dbb4bd3ecd4aa786821aeb0bf9674f0c36844910b6d054236a46f01547653
+  data.tar.gz: 1f7574dd6e4ea2e0cd028f6bec740b8d83b7b0f3f7b8f49d84b4a4d1e6602d19
 SHA512:
-  metadata.gz: b37cb49e755c9c62210f5a1fa09a9f4ef3a033ca9c9fdb5d8322c9f89bdb67e2dc7e0c0f142a1979ab0dec797eedfb26baec3a1728f7e95f743efc8078fa80a3
-  data.tar.gz: e070c451f2b990a68c58b336f67a3788272701efb70a1f138adbf066986390b25e6eb3a902fb8dbf64a1de9ee232319c2ded7ac601637a2b3308ece0aa7c7d47
+  metadata.gz: 7836705d30eb12466257455eb985aabe3b377665d44fc5a09d3554569ed90cdd8b0cadfc6987138ffc22cb16b9515f9ca6d1cdf5ebc796b34d90e5cad9d5fabd
+  data.tar.gz: e2697f2a5d79702cb97d1a605fdf0a8a5fd0cd6db898120a5f4f60e2500f4cf23dffdc513b1fd48a8ecf8d207ba92925ff13554c91083bda502cf54f75408105

data/app/models/effective/resources/relation.rb

@@ -301,6 +301,8 @@ module Effective
               .where(ActiveStorage::Blob.arel_table[:filename].matches("%#{term}%"))
 
           when :date, :datetime
+            attribute_type = relation.columns_hash[name.to_s]&.type # Returns :date, :datetime, etc
+
             if value.kind_of?(String) && term.respond_to?(:strftime)
               end_at = (
                 case (value.to_s.scan(/(\d+)/).flatten).length
@@ -314,16 +316,16 @@ module Effective
                 end
               )
 
-              if as == :date
-                relation.where("#{sql_column} >= ? AND #{sql_column} < ?", term.to_date, (end_at + 1.day).to_date)
-              else
+              if as == :datetime || attribute_type == :datetime
                 relation.where("#{sql_column} >= ? AND #{sql_column} <= ?", term, end_at)
+              else
+                relation.where("#{sql_column} >= ? AND #{sql_column} < ?", term.to_date, (end_at + 1.day).to_date)
               end
             elsif value.respond_to?(:strftime) && operation == :eq
-              if as == :date
-                relation.where("#{sql_column} = ?", value)
-              else
+              if as == :datetime || attribute_type == :datetime
                 relation.where("#{sql_column} >= ? AND #{sql_column} <= ?", value.beginning_of_day, value.end_of_day)
+              else
+                relation.where("#{sql_column} = ?", value)
               end
             elsif term.respond_to?(:strftime) == false && operation.to_s.include?('days_ago') == false
               relation.none # It's an invalid entered date 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.27.4'.freeze
+  VERSION = '2.27.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.27.4
+  version: 2.27.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-07 00:00:00.000000000 Z
+date: 2025-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails