rails-simple-search 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6310535f7e545c8b29ca69421df5a8f23efca79dab7ccec6311ed00c632c51d
-  data.tar.gz: 5379c314d28a7e06acf4e12ec23d78799e81b89843d1abf2717122e2f90cbbfc
+  metadata.gz: 359d3f0db9c1b924fbe313abf4a30bf796442a9785fd6914457f3b387a692e8f
+  data.tar.gz: d4f5f198779e95ee3bd60d5143f0ff89be4978429d718a1660eca7aafe221abe
 SHA512:
-  metadata.gz: 25829545f58e17b7234400719ef2707369cc2a5dbd608d3527c1aafd9a41cf7a5189e4f04857ea263887307faaaa66cce9850c8af024e450fd98095c95ea2989
-  data.tar.gz: 47bc9c46c5c56017bc1b6c468e811987f1738e1f38c4379217d77f474c62c640bbf1d9e154d7eaa099905b3337f7819d937718964b441af2c6c87958eb169259
+  metadata.gz: c66d51b2845ad96dbf656e523a4867e6ea320836cd642b322387846cda18067a567063a3ce59f7f2d09bb4919e37604025ff414f850e8529e660366cd632e749
+  data.tar.gz: 2334fa8f8b7ed85fe3558355e292843eb6c6a05c49b880af47589143e749eff08658683545120b09503979e90cec2a6078e48128e3263fb41d95e1d4a7ffa810

data/lib/sql_handler.rb

@@ -80,9 +80,10 @@ module RailsSimpleSearch
       format('A%02d', @joins[table_name][0])
     end
 
-    def insert_join(base_class, asso_ref, new_asso_chain)
+    def insert_join(base_class, asso_ref, new_asso_chain, poly_asso_type_class=nil)
+      return if asso_ref.polymorphic? && poly_asso_type_class.blank?
       base_table = base_class.table_name
-      asso_table = asso_ref.klass.table_name
+      asso_table = poly_asso_type_class&.table_name || asso_ref.klass.table_name
 
       @join_count ||= 0
       return if base_table == asso_table
@@ -93,12 +94,17 @@ module RailsSimpleSearch
       asso_table_alias = format('A%02d', @join_count)
 
       if asso_ref.belongs_to?
-        @joins[asso_table] =[@join_count, asso_table, "#{base_table_alias}.#{asso_ref.foreign_key} = #{asso_table_alias}.#{asso_ref.klass.primary_key}"]
+        if asso_ref.polymorphic?
+          join_cond = "#{base_table_alias}.#{asso_ref.foreign_key} = #{asso_table_alias}.#{poly_asso_type_class.primary_key}"
+          join_cond = "#{base_table_alias}.#{asso_ref.foreign_type} = '#{poly_asso_type_class.name}' and #{join_cond}"
+        else
+          join_cond = "#{base_table_alias}.#{asso_ref.foreign_key} = #{asso_table_alias}.#{asso_ref.klass.primary_key}"
+        end
       else
         join_cond = "#{base_table_alias}.#{base_class.primary_key} = #{asso_table_alias}.#{asso_ref.foreign_key}"
         join_cond = "#{asso_table_alias}.#{asso_ref.type} = '#{base_class.name}' and #{join_cond}" if asso_ref.type
-        @joins[asso_table] = [@join_count, asso_table, join_cond]
       end
+      @joins[asso_table] = [@join_count, asso_table, join_cond]
     end
 
     # This method parse a search parameter and its value
@@ -127,11 +133,22 @@ module RailsSimpleSearch
 
       base_class = @model_class
       new_asso_chain = true
-      until association_fields.empty?
-        association_fields[0] = base_class.reflect_on_association(association_fields[0].to_sym)
-        insert_join(base_class, association_fields[0], new_asso_chain)
+      while (current_association_string = association_fields.shift)
+        # polymorphic association with solid target table_name
+        # such as 'commentable:post'
+        if current_association_string.include?(':')
+          poly_asso_name, poly_asso_type = current_association_string.split(':')
+          current_association = base_class.reflect_on_association(poly_asso_name.to_sym)
+          poly_asso_type_class = poly_asso_type.downcase.camelize.constantize
+          insert_join(base_class, current_association, new_asso_chain, poly_asso_type_class)
+          base_class = poly_asso_type_class
+        else
+          current_association = base_class.reflect_on_association(current_association_string.to_sym)
+          insert_join(base_class, current_association, new_asso_chain)
+          base_class = current_association.klass
+        end
+
         new_asso_chain = false
-        base_class = association_fields.shift.klass
       end
 
       association_alias = table_name_to_alias(base_class.table_name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-simple-search
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Yi Zhang