refine-rails 2.13.8 → 2.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52fd39463e007be7957c4402ac0f1843fdb5012e6dafde1d7c14f15a54b1788a
-  data.tar.gz: 2de904d1ed64b3183e4c9a2a0a3824495e76e745a24462d08500eb635091dbf8
+  metadata.gz: 521418c5dea81f6f37f39181a4685c08208efe9f649b32709224cbfa37e60d05
+  data.tar.gz: 0a48b500cc68e8a798e257d2e24c33679b6bd691c2e3b0cb4f984b5c85846a87
 SHA512:
-  metadata.gz: 6619108c19f61b0fbf54b488ef0bc9111d009d596b4597d98a03d7647cc1ad1edeb6b817cb544c2bdc60437b4740c237760271088d42b87a4586a8d7e83f1963
-  data.tar.gz: '08dfb1cb2d1c3a81deb0290b1172b904f1b95529a7ac3dce901f5040f1f6ea74940297f5339be3423f026f8f55bb2d44ef552b2de5371d88ef46ca1248b4301a'
+  metadata.gz: 8fc6d6ea27e7c7052e1d2d798770636f8b847b932c8d3b32d562a2adfa553919e53f78bc45e7e889258a4a65fea5ded9c2b377363b6a6163fc21ce5810cab708
+  data.tar.gz: 42df46f4edc1fe7093514369fc3cfc9b0a31a6e6800c04832fa7cc572981948c886038aedaf65e17d7b4129fa10a2ba9fad04ff7c44f4fe2acdf91bb410a7437

data/app/models/refine/conditions/supports_flat_queries.rb

@@ -90,7 +90,7 @@ module Refine::Conditions
        
       end # End of while loop
 
-      if condition_joins.any?
+      if condition_joins.any? && !condition_uses_different_database?(model_class, query.model)
         add_pending_joins_if_needed(input: input, joins_array: condition_joins)
       end
 
@@ -147,10 +147,11 @@ module Refine::Conditions
     # the records matching the condition that will then be passed into the primary query.
     def handle_flat_cross_database_condition(root_model:, input:, relation_class:, relation_table_being_queried:, inverse_clause:, key_1:, key_2:)
       table = root_model.arel_table
-      relational_query = relation_class.select(key_2).arel
+      relational_query = relation_class.select(key_2).distinct.arel
       node = apply(input, relation_table_being_queried, relation_class, inverse_clause)
       relational_query = relational_query.where(node)
-      array_of_ids = relation_class.connection.exec_query(relational_query.to_sql).rows.flatten
+      results = relation_class.find_by_sql(relational_query.to_sql)
+      array_of_ids = results.map { |result| result.send(key_2) }
       if array_of_ids.length == 1
         nodes = table[:"#{key_1}"].eq(array_of_ids.first)
       else

data/app/models/refine/filter.rb

@@ -6,7 +6,6 @@ module Refine
     include Stabilize
     include Internationalized
     include Inspector
-    include FlatQueryTools
     # This validation structure sents `initial_query` as the method to validate against
     define_model_callbacks :initialize, only: [:after]
     after_initialize :valid?
@@ -92,10 +91,10 @@ module Refine
 
     def get_query
       raise "Initial query must exist" if initial_query.nil?
-      if blueprint.present?
-        @relation.where(group(make_sub_query(blueprint)))
+      if self.class.included_modules.include?(Refine::FlatQueryTools) && can_use_flat_query?
+        get_flat_query
       else
-        @relation
+        get_complex_query
       end
     end
 
@@ -105,6 +104,14 @@ module Refine
       result
     end
 
+    def get_complex_query
+      if blueprint.present?
+        @relation.where(group(make_sub_query(blueprint)))
+      else
+        @relation
+      end
+    end
+
     def add_nodes_to_query(subquery:, nodes:, query_method:)
       # Apply existing nodes to existing subquery
       if subquery.present? && nodes.present?
@@ -213,6 +220,7 @@ module Refine
 
     def apply_condition(criterion)
       begin
+        condition = get_condition_for_criterion(criterion)
         get_condition_for_criterion(criterion)&.apply(criterion[:input], table, initial_query, false, nil)
       rescue Refine::Conditions::Errors::ConditionClauseError => e
         e.errors.each do |error|

data/app/models/refine/flat_query_tools.rb

@@ -47,7 +47,16 @@ module Refine
         else
           unless condition_already_applied?(criteria_or_conjunction)
             node = apply_flat_condition(criteria_or_conjunction)
-            @relation = @relation.where(Arel.sql(node.to_sql))
+            if node.is_a?(Arel::Nodes::Grouping)
+              @relation = @relation.where(node)
+            elsif node.is_a?(Array)
+              error = node.filter{ |n| n.is_a?(ActiveModel::Error) }.first
+              if error
+                filter.errors.add(:base, error.full_message)
+              end
+            else
+              @relation = @relation.where(Arel::Nodes::Grouping.new(node))
+            end
             track_condition_applied(criteria_or_conjunction)
           end
         end
@@ -84,7 +93,6 @@ module Refine
           end
           join_count += 1
         end
-
       end
     end
 
@@ -100,5 +108,10 @@ module Refine
       applied_conditions[criterion[:condition_id]] && 
         applied_conditions[criterion[:condition_id]].include?(criterion[:input])
     end
+
+    # Meant to be overridden by Filter classes to add or replace with custom logic
+    def can_use_flat_query?
+      !uses_or? && !uses_negative_clause? && !has_duplicate_conditions?
+    end
   end
 end

data/lib/refine/rails/version.rb

@@ -1,5 +1,5 @@
 module Refine
   module Rails
-    VERSION = "2.13.8"
+    VERSION = "2.14.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refine-rails
 version: !ruby/object:Gem::Version
-  version: 2.13.8
+  version: 2.14.1
 platform: ruby
 authors:
 - Colleen Schnettler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-28 00:00:00.000000000 Z
+date: 2025-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails