refine-rails 2.13.4 → 2.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40da5d98e34b1e013ee9019520147512b97f1e7130ccca08d05b0ba0429e6540
-  data.tar.gz: e8b762451c73d83718f1fb98811bbb89aa5d2dee1b3f5ec828c3f1da85f563c7
+  metadata.gz: 106e21d10bc77a60ebd5b8327c38ed45f1db7a47f3a0d7220b118478aa78048e
+  data.tar.gz: 7f00f82bbfcb68a6249385d4e64298ed6d853451d7898cf23f994fa877b2c599
 SHA512:
-  metadata.gz: 145af9023fa64fa006748da902668154244a59cf75a5669c9c47a8d038a06bdaa920fdf34207305837defe4390d1dfcc3533af7f257781f59b2a4db94cc82217
-  data.tar.gz: 537698a2c4e28b6630e934adf7b13ccf0460b7f2fe3760e9189f4cd01340343a03ff57b178b5fc189e24b3e0dd039ec756c8a08baab17d2115405885ee13de8e
+  metadata.gz: 602fbed9036cac55d1c8402624a690ab0b14acc0ce751346fd9f21f6aee42890d171b760a86c0e403c516508d3696febbeac07359cce8b794db6a66bbb202072
+  data.tar.gz: 728e3a516839d718df569864d69fb888c0426a0f8854ebca194336dc5a06a40fbdf59343c0eb27ad056ca61ced186592df756aef0e468343d4ebc9c287929cb3

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

@@ -15,6 +15,7 @@ module Refine::Conditions
     # @param [ActiveRecord::Relation] initial_query The base query the query is built on 
     # @param [Bool] inverse_clause Whether to invert the clause
     # @return [Arel::Node] 
+    # 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
       # Ensurance validations are checking the developer configured correctly
@@ -27,6 +28,7 @@ module Refine::Conditions
       # TODO Determine right place to set the clause
       validate_user_input(input)
       if input.dig(:filter_refinement).present?
+        # TODO - Handle refinements. Currently not working for flat queries because its dependent on the pending_subquery system
 
         filter_condition = call_proc_if_callable(@filter_refinement_proc)
         # Set the filter on the filter_condition to be the current_condition's filter
@@ -39,7 +41,7 @@ module Refine::Conditions
       end
 
       if is_relationship_attribute?
-        return handle_flat_relational_condition(input: input, query: initial_query, inverse_clause: inverse_clause)
+        return handle_flat_relational_condition(input: input, table: table, query: initial_query, inverse_clause: inverse_clause)
       end
       # Not a relationship attribute, apply condition normally
       nodes = apply_condition(input, table, inverse_clause)
@@ -51,7 +53,7 @@ module Refine::Conditions
       nodes
     end
 
-    def handle_flat_relational_condition(input:, query:, inverse_clause:)
+    def handle_flat_relational_condition(input:, table:, query:, inverse_clause:)
       # Split on first .
       decompose_attribute = @attribute.split(".", 2)
       # Attribute now is the back half of the initial attribute
@@ -78,9 +80,11 @@ module Refine::Conditions
         # 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])
         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"
+      # else
+      #   puts "TODO - not referencing an ID in attribute"
       end
 
       unless instance
@@ -90,7 +94,15 @@ module Refine::Conditions
       relation_table_being_queried = through_reflection.klass.arel_table
       relation_class = through_reflection.klass
 
-      nodes = apply_condition(input, relation_table_being_queried, inverse_clause)
+      instance = get_reflection_object(query, relation)
+      key_1 = key_1(instance)
+      key_2 = key_2(instance)
+      if condiiton_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)
+      end
+
       if !is_refinement && has_any_refinements?
         refined_node = apply_refinements(input)
         # Count refinement will return nil because it directly modified pending relationship subquery
@@ -98,11 +110,20 @@ module Refine::Conditions
       end
       nodes
 
-      # if can_use_where_in_relationship_subquery?(instance)
-      #   create_pending_wherein_subquery(input: input, relation: relation, instance: instance, query: query)
-      # else
-      #   create_pending_has_many_through_subquery(input: input, relation: relation, instance: instance, query: query)
-      # end
+    end
+
+    # When we need to go to another DB for the relation. We need to do a separate query to get the IDS of
+    # the records matching the condition that will then be passed into the primary query.
+    def handle_flat_cross_database_condition(input:, table:, relation_class:, relation_table_being_queried:, inverse_clause:, key_1:, key_2:)
+      relational_query = relation_class.select(key_2).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
+      if array_of_ids.length == 1
+        nodes = table[:"#{key_1}"].eq(array_of_ids.first)
+      else
+        nodes = table[:"#{key_1}"].in(array_of_ids)
+      end
     end
 
     def get_through_reflection(instance:, relation:)
@@ -139,5 +160,10 @@ module Refine::Conditions
         add_pending_join(reflection.name, :inner)
       end
     end
+
+    def condiiton_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
   end
 end

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

@@ -21,13 +21,7 @@ module Refine::Conditions
 
       # Get the Reflection object which defines the relationship between query and relation
       # First iteration pull relationship using base query which responds to model.
-      instance = if query.respond_to? :model
-        query.model.reflect_on_association(relation.to_sym)
-      else
-        # When query is sent in as subquery (recursive) the query object is the model class pulled from the
-        # previous instance value
-        query.reflect_on_association(relation.to_sym)
-      end
+      instance = get_reflection_object(query, relation)
 
       unless instance
         raise "Relationship does not exist for #{relation}."
@@ -69,6 +63,16 @@ module Refine::Conditions
       end
     end
 
+    def get_reflection_object(query, relation)
+      if query.respond_to? :model
+        query.model.reflect_on_association(relation.to_sym)
+      else
+        # When query is sent in as subquery (recursive) the query object is the model class pulled from the
+        # previous instance value
+        query.reflect_on_association(relation.to_sym)
+      end
+    end
+
     def create_pending_wherein_subquery(input:, relation:, instance:, query:)
       # This method builds out the linking keys between the provided query model and the relation
       # and saves it to pending relationship subqueries

data/app/models/refine/flat_query_tools.rb

@@ -3,7 +3,7 @@
 # NOTE: This is more specialized query construction and it is up to the implementer to use the inspector tools to ensure this is only being used for supported queries
 module Refine
   module FlatQueryTools
-    attr_accessor :pending_joins, :applied_conditions
+    attr_accessor :pending_joins, :applied_conditions, :needs_distinct
 
     def pending_joins
       @pending_joins ||= {}
@@ -13,6 +13,10 @@ module Refine
       @applied_conditions ||= {}
     end
 
+    def needs_distinct?
+      @needs_distinct ||= false
+    end
+
     def get_flat_query
       raise "Initial query must exist" if initial_query.nil?
       raise "Cannot make flat query for a filter using OR conditions" if uses_or?
@@ -51,6 +55,9 @@ module Refine
       if pending_joins.present?
         apply_pending_joins
       end
+      if needs_distinct?
+        @relation = @relation.distinct
+      end
       @relation
     end
 

data/app/models/refine/inspector.rb

@@ -37,5 +37,12 @@ module Refine
       @blueprint.select{|c| c[:type] == "criterion" && negative_clauses.include?(c[:input][:clause])}.any?
     end
 
+    def has_duplicate_conditions?
+      return false if @blueprint.nil? || @blueprint.empty?
+      conditions = @blueprint.select{|c| c[:type] == "criterion"}
+      condition_ids = conditions.map{|c| c[:condition_id]}
+      condition_ids.length != condition_ids.uniq.length
+    end
+
   end
 end

data/app/models/refine/tracks_pending_relationship_subqueries.rb

@@ -116,6 +116,7 @@ module Refine
       subset.each do |relation, subquery|
         # relation = table
         # subquery.keys = [:instance, :query, :key, :secondary] possibly (:children)
+
         if subquery.dig(:children).present?
           # Send in the values at children as the subset hash and remove from existing subquery
           child_nodes = subquery.delete(:children)

data/app/views/refine/advanced_inline/criteria/new.turbo_stream.erb

@@ -1,6 +1,5 @@
 <% form_id = dom_id(@criterion, :form) %>
 
-<% puts "In New Turbo Stream" %>
 <%= turbo_stream.update dom_id(@criterion) do %>
   <%= render "refine/advanced_inline/filters/popup",
     frame_id: dom_id(@criterion), is_open: true do

data/lib/refine/rails/version.rb

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

metadata

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