refine-rails 2.13.6 → 2.13.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 106e21d10bc77a60ebd5b8327c38ed45f1db7a47f3a0d7220b118478aa78048e
-  data.tar.gz: 7f00f82bbfcb68a6249385d4e64298ed6d853451d7898cf23f994fa877b2c599
+  metadata.gz: ed9b99ff1ffc9ead0b84cead020b7abd3340b3b1ea85506ff51436469c8d38c8
+  data.tar.gz: e94ad2aec17f47227f2c590632266fda4d567fe757ed4eb7a139bd8e45d70c1a
 SHA512:
-  metadata.gz: 602fbed9036cac55d1c8402624a690ab0b14acc0ce751346fd9f21f6aee42890d171b760a86c0e403c516508d3696febbeac07359cce8b794db6a66bbb202072
-  data.tar.gz: 728e3a516839d718df569864d69fb888c0426a0f8854ebca194336dc5a06a40fbdf59343c0eb27ad056ca61ced186592df756aef0e468343d4ebc9c287929cb3
+  metadata.gz: 387b1428a0ac1d05da2291578c14b08b208499243c3f6c546afc437f62a932c343d675e1e0189337a752ed52cd3beef9e3f847f638ac238f08465e367629bad5
+  data.tar.gz: 436423c40e435a5c35290e5cc1572fc88f6ff4a57ba2e42b2370140811a52bcbf20ca8e1f4a046509292a3f9454de19b992baad4faf2792555535abc1c6c8d64

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

@@ -16,7 +16,7 @@ module Refine::Conditions
     include SupportsFlatQueries
 
     attr_reader :ensurances, :before_validations, :clause, :filter
-    attr_accessor :display, :id, :is_refinement, :attribute
+    attr_accessor :display, :id, :is_refinement, :attribute, :is_flat_query
 
     I18N_PREFIX = "refine.refine_blueprints.condition."
 

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

@@ -18,6 +18,7 @@ module Refine::Conditions
     # This is mostly a copy of the `apply` method from the Condition module, but avoids recursion and the pending_subquery system
     def apply_flat(input, table, initial_query, inverse_clause=false)
       table ||= filter.table
+      @is_flat_query = true
       # Ensurance validations are checking the developer configured correctly
       run_ensurance_validations
       # Allow developer to modify user input
@@ -73,20 +74,27 @@ module Refine::Conditions
       end
 
       through_reflection = instance
+      forced_id = false
 
       # TODO - make sure we're accounting for refinements
       if @attribute == "id"
         # We're referencing a primary key ID, so we dont need the final join table and
         # can just reference the foreign key of the previous step in the relation chain
         through_reflection = get_through_reflection(instance: instance, relation: decompose_attribute[0])
+        unless condition_uses_different_database?(through_reflection.klass, query.model)
+          forced_id = true
+          @attribute = get_foreign_key_from_relation(instance: instance, reflection: through_reflection)
+        end
+      end
+
+      unless condition_uses_different_database?(through_reflection.klass, query.model)
         add_pending_joins_if_needed(instance: instance, reflection: through_reflection, input: input)
-        # TODO - this is not the right long-term place for this.
-        filter.needs_distinct = true
-        @attribute = get_foreign_key_from_relation(instance: instance, reflection: through_reflection)
-      # else
-      #   puts "TODO - not referencing an ID in attribute"
       end
+      # TODO - this is not the right long-term place for this.
+      apply_flat_relational_condition(instance: instance, relation: relation, through_reflection: through_reflection, input: input, table: table, query: query, inverse_clause: inverse_clause, forced_id: forced_id)
+    end
 
+    def apply_flat_relational_condition(instance:, relation:, through_reflection:, input:, table:, query:, inverse_clause:, forced_id: false)
       unless instance
         raise "Relationship does not exist for #{relation}."
       end
@@ -94,13 +102,18 @@ module Refine::Conditions
       relation_table_being_queried = through_reflection.klass.arel_table
       relation_class = through_reflection.klass
 
-      instance = get_reflection_object(query, relation)
+      instance = get_reflection_object(query, relation) if forced_id
+
       key_1 = key_1(instance)
       key_2 = key_2(instance)
-      if condiiton_uses_different_database?(relation_class, query.model)
+      if condition_uses_different_database?(relation_class, query.model)
         nodes = handle_flat_cross_database_condition(input: input, table: table, relation_class: relation_class, relation_table_being_queried: relation_table_being_queried, inverse_clause: inverse_clause, key_1: key_1, key_2: key_2)  
       else
-        nodes = apply(input, relation_table_being_queried, query, inverse_clause, key_2)
+        if forced_id
+          nodes = apply(input, relation_table_being_queried, query, inverse_clause, key_2)
+        else
+          nodes = apply(input, relation_table_being_queried, query, inverse_clause)
+        end
       end
 
       if !is_refinement && has_any_refinements?
@@ -109,7 +122,6 @@ module Refine::Conditions
         nodes = nodes.and(refined_node) if refined_node
       end
       nodes
-
     end
 
     # When we need to go to another DB for the relation. We need to do a separate query to get the IDS of
@@ -148,6 +160,7 @@ module Refine::Conditions
       # If we already are tracking the relation with a left joins, don't overwrite it
       # puts "adding a pending join for relation: #{relation} with join type: #{join_type}"
       unless join_type == :inner && filter.pending_joins[relation] == :left
+        filter.needs_distinct = true
         filter.pending_joins[relation] = join_type
       end
     end
@@ -161,7 +174,7 @@ module Refine::Conditions
       end
     end
 
-    def condiiton_uses_different_database?(current_model, parent_model)
+    def condition_uses_different_database?(current_model, parent_model)
       # Are the queries on different databases?
       parent_model.connection_db_config.configuration_hash != current_model.connection_db_config.configuration_hash
     end

data/lib/refine/rails/version.rb

@@ -1,5 +1,5 @@
 module Refine
   module Rails
-    VERSION = "2.13.6"
+    VERSION = "2.13.7"
   end
 end

metadata

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