rails-simple-search 1.1.10 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bbf2eecbbb512c647a434d6f6d1f928652cfeafa00c8c52226a88c1ec6bc23c
-  data.tar.gz: 8b32419b7e0daa8baa581dfd96e04b08513960bbc1a628bda321c12493de6a08
+  metadata.gz: 290634cd836385acaa327ac5b5971e75a716291d51629d8c54dc3c8db728e466
+  data.tar.gz: 9a8c7d6985147d3669c9cf1d98cf41fed6854e1039bdddf7fc271b6b4c4d5f01
 SHA512:
-  metadata.gz: 9032b02b2027ee62b51680ed8310ccf7579a8eef33494f6536dfc91f414f853bff2496ee53fb875dccfd52f84e60dacea7d3221eba27d51bc5ceafc73873be63
-  data.tar.gz: 796835f0e60438a36e52783eac52e0fdecf9e4ff3fd9789aa53f95396cdae797d1567c9477dea2fb3e773893950bc8aea54b3ed1f7f0c54b4c164deab0c1c28f
+  metadata.gz: 890be5b99ab922d000adad63885a50a4bd678a1294b4915c32db93d808ac89774934626a0b73b3dd117728beb7d6b62a2df15c3b9353fb0113a80a05f11a57fa
+  data.tar.gz: 2e72fd3aef31f0b0b3fdf7b34e80a5f1035cac36b869a62d543d178c5bee132a78caf00605bd1bc93e60e675b52ced76a9fffffb0d22be23acad1e65adf0269b

data/README.md

@@ -89,7 +89,7 @@ The following is how we implement this searching function with rails-simple-sear
       <%=f.text_field "address.city" %>                    <!-- address is an association of model User -->
 
       <%=f.label "name of any one who commented to my posts" %>
-      <%=f.text_field "posts.comments.author.first_name_or_posts.comments.author.last_name" %> 
+      <%=f.text_field "posts.comments.user.first_name_or_posts.comments.user.last_name" %>
                                                            <!-- the associations could go even deeper, isn't it POWERFUL? -->
 
       <%=f.submit %>
@@ -122,7 +122,7 @@ From version 1.1.0 on, we started to support the "or" relation, e.g., we can use
 
 From version 1.1.3 on, we started to support Rails 5.
 
-For Rails 7, please use version 1.1.9.
+For Rails 7, please use version 1.2.0.
 
 ## License
 

data/lib/sql_handler.rb

@@ -1,7 +1,7 @@
 module RailsSimpleSearch
   module SqlHandler
     def init
-      @table_name = @model_class.table_name
+      @model_table_name = @model_class.table_name
       @joins = {}
     end
 
@@ -36,7 +36,7 @@ module RailsSimpleSearch
       joins.each do |j|
         table = j[1]
         constrain = j[2]
-        @joins_str << " inner join #{table} on #{constrain}"
+        @joins_str << format(" inner join #{table} AS A%02d on #{constrain}", j[0])
       end
     end
 
@@ -45,16 +45,17 @@ module RailsSimpleSearch
       @condition_group.set_relation(:and)
 
       @criteria.each do |key, value|
-        @condition_group.add(parse_attribute(key, value))
+        @condition_group.add(parse_search_parameters(key, value))
       end
 
       make_joins
     end
 
-    def insert_condition(base_class, field, value)
+    def build_single_condition(base_class, association_alias, field, value)
       field, operator = parse_field_name(field)
       table = base_class.table_name
       key = "#{table}.#{field}"
+      final_key = "#{association_alias}.#{field}"
 
       column = base_class.columns_hash[field.to_s]
       return nil unless column
@@ -65,14 +66,18 @@ module RailsSimpleSearch
         verb = 'in'
       elsif operator
         verb = operator
-      elsif text_column?(column) && ! @config[:exact_match].include?((@table_name == table) ? field : key)
+      elsif text_column?(column) && ! @config[:exact_match].include?((@model_table_name == table) ? field : key)
         verb = 'like'
         value = "%#{value}%"
       else
         verb = '='
       end
 
-      ConditionGroup.new(ConditionItem.new(key, verb, value))
+      ConditionGroup.new(ConditionItem.new(final_key, verb, value))
+    end
+
+    def table_name_to_alias(table_name)
+      format('A%02d', @joins[table_name][0])
     end
 
     def insert_join(base_class, asso_ref)
@@ -84,31 +89,39 @@ module RailsSimpleSearch
       return unless @joins[asso_table].nil?
 
       @join_count += 1
+      base_table_alias = @join_count < 2 ? base_table : table_name_to_alias(base_table)
+      asso_table_alias = format('A%02d', @join_count)
+
       if asso_ref.belongs_to?
-        @joins[asso_table] =[@join_count, asso_table, "#{base_table}.#{asso_ref.foreign_key} = #{asso_table}.#{asso_ref.klass.primary_key}"]
+        @joins[asso_table] =[@join_count, asso_table, "#{base_table_alias}.#{asso_ref.foreign_key} = #{asso_table_alias}.#{asso_ref.klass.primary_key}"]
       else
-        join_cond = "#{base_table}.#{base_class.primary_key} = #{asso_table}.#{asso_ref.foreign_key}"
-        join_cond = "#{asso_table}.#{asso_ref.type} = '#{base_class.name}' and #{join_cond}" if asso_ref.type
+        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
     end
 
-    def parse_attribute(attribute, value)
+    # This method parse a search parameter and its value
+    # then produce a ConditionGroup
+    def parse_search_parameters(attribute, value)
+      # handle _or_ parameters
       attributes = attribute.split(@config[:or_separator])
       if attributes.size > 1
         cg = ConditionGroup.new
         cg.set_relation(:or)
         attributes.each do |a|
-          cg.add(parse_attribute(a, value))
+          cg.add(parse_search_parameters(a, value))
         end
         return cg
       end
 
+      # handle direct fields
       unless attribute =~ /\./
-        condition = insert_condition(@model_class, attribute, value)
+        condition = build_single_condition(@model_class, @model_class.table_name, attribute, value)
         return condition
       end
 
+      # handle association fields
       association_fields = attribute.split(/\./)
       field = association_fields.pop
 
@@ -119,10 +132,12 @@ module RailsSimpleSearch
         base_class = association_fields.shift.klass
       end
 
-      insert_condition(base_class, field, value)
+      association_alias = table_name_to_alias(base_class.table_name)
+      build_single_condition(base_class, association_alias, field, value)
     end
   end
 
+  # This class holds a single condition
   class ConditionItem
     attr_reader :field, :verb, :value
 
@@ -133,6 +148,9 @@ module RailsSimpleSearch
     end
   end
 
+  # This class holds a ConditionGroup
+  # One ConditionGroup can hold one or more
+  # conditions
   class ConditionGroup
     def initialize(item = nil)
       if item

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-simple-search
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.2.0
 platform: ruby
 authors:
 - Yi Zhang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-26 00:00:00.000000000 Z
+date: 2023-12-27 00:00:00.000000000 Z
 dependencies: []
 description: rails-simple-search is a light and easy to use gem. It could help developers
   quickly build a search page.