effective_resources 2.2.3 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d4c8949c461fb0b18d3678caf9a4042f365075ee62dcaccc2fdb8959e9a9f88
-  data.tar.gz: 37fac9155c56b4f08329b7c1aa3ace75732837c2a992057bf6a9cb309ea6b16c
+  metadata.gz: 90e5bf3fd1991d755505ba17c9ec917279bed6ed92e8b336005ccbcf4568ac01
+  data.tar.gz: 84a1301995e457d5ac7250528ca7dafb6ac3d043d41c8dec65a200f452217c11
 SHA512:
-  metadata.gz: 6f1d0ebbf97e9833f1a5d22a37da11f91eaf86f57a1f3091793373b81d32b352bee94e641816e2efccdbea569ded82db913743e18288ba2eeb40efefe3dc24e5
-  data.tar.gz: d6199a46442c28b8d6c808e80933954d79cb3d7f584a603dd748329b47d58ffa327872e7f102c9a5dbcef4a352d3cec6055e175206b98628dd794e1b34a06328
+  metadata.gz: 481fd4b475b39f2c048288831ae0929b86062dbb63edb49ada6b4652a7c33953a172bb9f3ec5f2c4d9cf2d1653bf3a6625b692d8d776ae6b11281ca30bc57b73
+  data.tar.gz: eab64d1fa9fb21caa68e028943ea22bd4ced563a7ca9fb08d35e23dd5ae325c00918a1485273297ef46311c047eef4790631d60022a9eea5eed1bc4504d74bdd

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

@@ -284,7 +284,7 @@ module Effective
         term = Attribute.new(as).parse(value, name: name) || value
 
         # If using the joined syntax from datatables
-        joined = sql_column.to_s.include?('.')
+        joined = (sql_column.to_s.split('.').first.to_s.include?(relation.arel_table.name) == false)
 
         searched = case as
           when :active_storage
@@ -305,12 +305,7 @@ module Effective
                 end
               )
 
-              if joined
-                relation.where("#{sql_column} >= ? AND #{sql_column} <= ?", term, end_at)
-              else
-                relation.where(attribute.gteq(term)).where(attribute.lteq(end_at))
-              end
-
+              relation.where("#{sql_column} >= ? AND #{sql_column} <= ?", term, end_at)
             end
 
           when :effective_obfuscation
@@ -334,11 +329,11 @@ module Effective
         return searched if searched
 
         # Simple operation search
+        # The Arel operator eq and matches bug out with serialized Array columns. So we avoid for datatables usage.
+
         case operation
-          when :eq then
-            joined ? relation.where("#{sql_column} = ?", term) : relation.where(attribute.eq(term))
-          when :matches then
-            joined ? relation.where("#{sql_column} #{ilike} ?", "%#{term}%") : relation.where(attribute.eq(term))
+          when :eq then relation.where("#{sql_column} = ?", term)
+          when :matches then relation.where("#{sql_column} #{ilike} ?", "%#{term}%")
           when :not_eq then relation.where(attribute.not_eq(term))
           when :does_not_match then relation.where(attribute.does_not_match("%#{term}%"))
           when :starts_with then relation.where(attribute.matches("#{term}%"))

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.2.3'.freeze
+  VERSION = '2.2.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2023-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails