effective_resources 2.2.2 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0eda305985b8b6f064121996ea89bdc6fa97dc96fbd0eaa0bf465b37097f815f
-  data.tar.gz: b962a2a0690c5931b8c86e730d3ea7cca7b47465451062360ec74873f94cd525
+  metadata.gz: af933d56ed2a8a49c9b05dfee64b5a8e7a13d84358c54966208507f1703090ec
+  data.tar.gz: dd28e88602d3c2d9f4b908d79260b2849d34cbdd3c8b6c204a18c96c2ad2d217
 SHA512:
-  metadata.gz: c462cf9c88eab4d3d897fc5bd00738a61724fc4bf9f6587d38fa9ee3d726f57807c7a4b5d88ea3c83442fb99f255ade0977e18beedd6050506d1c77187e95913
-  data.tar.gz: 8c8b7f7fec0d143f561002e7c9b8b5d10aaceb1ab7c7d9747614d68a55b464366bafd7d1aee01b034edb2da65aad0d686c91252f28ee3da472d5adc9affc6e56
+  metadata.gz: a46d1580c41d7597766cea58782d0e7c4092aca90210049b5155d9b0330c3b5ed01cb8f24d8ab299bc12fcdec13a3b9f79fb8e4959e4cb3b38af1a1d407164a2
+  data.tar.gz: a422ebe046792b4f000918c86a0df61e9884f276dbb5d580cce8ac02fb090186552cc25ae3da26682775460ef84a9da7a7296e2260e9e02c1a5ccec7d5960e0f

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

@@ -81,7 +81,7 @@ module Effective
           search_associated(name, value, as: sql_as, operation: sql_operation)
         else
           return relation.where(is_null(sql_column)) if value.to_s == 'nil'
-          search_attribute(name, value, as: sql_as, operation: sql_operation)
+          search_attribute(name, value, as: sql_as, operation: sql_operation, sql_column: sql_column)
         end
       end
 
@@ -274,7 +274,7 @@ module Effective
         retval || raise("unable to search associated #{as} #{operation} #{name} for #{value}")
       end
 
-      def search_attribute(name, value, as:, operation:)
+      def search_attribute(name, value, as:, operation:, sql_column:)
         raise 'expected relation to be present' unless relation
 
         attribute = relation.arel_table[name]
@@ -283,6 +283,9 @@ module Effective
         # If you pass an email attribute it can return nil so we return the full value
         term = Attribute.new(as).parse(value, name: name) || value
 
+        # If using the joined syntax from datatables
+        joined = (sql_column.to_s.split('.').first.to_s.include?(relation.arel_table.name) == false)
+
         searched = case as
           when :active_storage
             relation.send("with_attached_#{name}").references("#{name}_attachment")
@@ -302,7 +305,12 @@ module Effective
                 end
               )
 
-              relation.where(attribute.gteq(term)).where(attribute.lteq(end_at))
+              if joined
+                relation.where("#{sql_column} >= ? AND #{sql_column} <= ?", term, end_at)
+              else
+                relation.where(attribute.gteq(term)).where(attribute.lteq(end_at))
+              end
+
             end
 
           when :effective_obfuscation
@@ -327,9 +335,11 @@ module Effective
 
         # Simple operation search
         case operation
-          when :eq then relation.where(attribute.eq(term))
+          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.matches("%#{term}%"))
           when :not_eq then relation.where(attribute.not_eq(term))
-          when :matches then relation.where(attribute.matches("%#{term}%"))
           when :does_not_match then relation.where(attribute.does_not_match("%#{term}%"))
           when :starts_with then relation.where(attribute.matches("#{term}%"))
           when :ends_with then relation.where(attribute.matches("%#{term}"))

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.2.2'.freeze
+  VERSION = '2.2.4'.freeze
 end

metadata

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