searchlogic 1.6.2 → 1.6.3

data/CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+== 1.6.3 released 2008-12-13
+
+* Added in avg, count, and sum modifiers for SQLite and Postgres.
+* Added ne for not_equal condition.
+* Ignore :include option for calculations since we don't need it and AR throws an error for polymorphic relationships.
+* Removed sum and count since they can not be in the WHERE statement, but must be in the HAVING statement
+* Added in auto joins for groups so that the joins don't have to be manually specified.
+* Use first column in column_names as the default column for calculations, since a column is required when using DISTINCT and some tables can have more than one primary key.
+* On associations see what the first conditions "any" status is to determine if to join with "ANY" or "AND"
+
 == 1.6.2 released 2008-12-13
 
 * Remove duplicate joins at a lower level for a cleaner and less brittle approach.

data/lib/searchlogic/active_record/base.rb

@@ -130,7 +130,7 @@ module Searchlogic
             sql_parts.each do |part|
               part = part.strip
               if is_join_statement
-                if !cleaned_parts.include?(part)
+                if !includes_join?(cleaned_parts, part)
                   cleaned_parts << part
                 else
                   cleaned_parts.pop
@@ -145,6 +145,16 @@ module Searchlogic
           sql
         end
         
+        def includes_join?(cleaned_parts, part)
+          cleaned_parts.each do |cleaned_part|
+            a = cleaned_part.gsub("`", "")
+            b = part.gsub("`", "")
+            return true if a == b
+            return true if a == b.gsub(/([a-z\._]*) = ([a-z\._]*)/, '\2 = \1')
+          end
+          false
+        end
+        
         def filter_options_with_searchlogic(options = {}, searching = true)
           return options unless Searchlogic::Search::Base.needed?(self, options)
           search = Searchlogic::Search::Base.create_virtual_class(self).new # call explicitly to avoid merging the scopes into the search

data/lib/searchlogic/active_record/connection_adapters/mysql_adapter.rb

@@ -109,10 +109,6 @@ module Searchlogic
           "COT(#{column_name})"
         end
         
-        def count_sql(column_name)
-          "COUNT(#{colun_name})"
-        end
-        
         def degrees_sql(column_name)
           "DEGREES(#{column_name})"
         end
@@ -169,10 +165,6 @@ module Searchlogic
           "SQRT(#{column_name})"
         end
         
-        def sum_sql(column_name)
-          "SUM(#{column_name})"
-        end
-        
         def tan_sql(column_name)
           "TAN(#{column_name})"
         end

data/lib/searchlogic/active_record/connection_adapters/postgresql_adapter.rb

@@ -93,6 +93,10 @@ module Searchlogic
           "atan(#{column_name})"
         end
         
+        def avg_sql(column_name)
+          "AVG(#{column_name})"
+        end
+        
         def ceil_sql(column_name)
           "ceil(#{column_name})"
         end

data/lib/searchlogic/active_record/connection_adapters/sqlite_adapter.rb

@@ -47,6 +47,11 @@ module Searchlogic
           "(strftime('%Y', #{column_name}) * 1)"
         end
         
+        # Number functions
+        def avg_sql(column_name)
+          "AVG(#{column_name})"
+        end
+        
         # String functions
         def lower_sql(column_name)
           "lower(#{column_name})"

data/lib/searchlogic/condition/not_equal.rb

@@ -6,7 +6,7 @@ module Searchlogic
       
       class << self
         def condition_names_for_column
-          super + ["does_not_equal", "not_equal", "is_not", "not"]
+          super + ["does_not_equal", "not_equal", "is_not", "not", "ne"]
         end
       end
       

data/lib/searchlogic/conditions/any_or_all.rb

@@ -16,7 +16,7 @@ module Searchlogic
       end
       
       def any # :nodoc:
-        any?
+        @any
       end
       
       # Convenience method for determining if we should join the conditions with "AND" or "OR".

data/lib/searchlogic/conditions/base.rb

@@ -139,9 +139,8 @@ module Searchlogic
         return @conditions if @conditions # return the conditions if the user set them with a string, aka sql conditions
         joined_conditions = nil
         objects.each do |object|
-          any = !object.explicit_any.nil? && (condition?(object) || group?(object)) ? object.explicit_any? : any?
           sanitized_conditions = group?(object) ? scope_condition(object.sanitize) : object.sanitize
-          joined_conditions = merge_conditions(joined_conditions, sanitized_conditions, :any => any)
+          joined_conditions = merge_conditions(joined_conditions, sanitized_conditions, :any => join_object_with_any?(object))
         end
         joined_conditions
       end
@@ -223,6 +222,15 @@ module Searchlogic
           @objects ||= []
         end
         
+        def join_object_with_any?(object)
+          return any? if !any.nil?
+          if condition?(object) || group?(object)
+            object.explicit_any?
+          elsif association?(object)
+            object.send(:join_object_with_any?, object.send(:objects).first)
+          end
+        end
+        
         def remove_conditions_from_protected_assignement(conditions)
           return conditions if klass.accessible_conditions.nil? && klass.protected_conditions.nil?
           if klass.accessible_conditions

data/lib/searchlogic/conditions/groups.rb

@@ -6,9 +6,25 @@ module Searchlogic
     module Groups
       def self.included(klass)
         klass.class_eval do
+          alias_method_chain :auto_joins, :groups
         end
       end
       
+      def auto_joins_with_groups
+        auto_joins = auto_joins_without_groups
+        auto_joins = auto_joins.is_a?(Array) ? auto_joins : [auto_joins].compact
+        
+        group_objects.each do |group|
+          next if group.conditions.blank?
+          group_joins = group.auto_joins
+          next if group_joins.blank?
+          group_joins = group_joins.is_a?(Array) ? group_joins : [group_joins]
+          auto_joins += group_joins
+        end
+        
+        auto_joins.blank? ? nil : (auto_joins.size == 1 ? auto_joins.first : auto_joins)
+      end
+      
       # Creates a new group object to set condition off of. See examples at top of class on how to use this.
       def group(conditions = nil, &block)
         obj = self.class.new

data/lib/searchlogic/config/helpers.rb

@@ -11,7 +11,7 @@ module Searchlogic
       class << self
         # Which hidden fields to automatically include when creating a form with a Searchlogic object. See Searchlogic::Helpers::Form for more info.
         #
-        # * <tt>Default:</tt> [:order_by, :order_as, :per_page]
+        # * <tt>Default:</tt> [:order_by, :order_as, :priority_order_by, :priority_order_as, :per_page]
         # * <tt>Accepts:</tt> Array, nil, false
         def hidden_fields
           @hidden_fields ||= (Searchlogic::Search::Base::SPECIAL_FIND_OPTIONS - [:page, :priority_order])

data/lib/searchlogic/helpers/form.rb

@@ -121,16 +121,16 @@ module Searchlogic
             return unless search_object.is_a?(Search::Base)
             name = args.first
             options = args.extract_options!
-            options
+            html = ""
             search_options[:hidden_fields].each do |field|
-              html = hidden_field(name, field, :object => search_object, :id => "#{name}_#{field}_#{options.object_id}", :value => (field == :order_by ? searchlogic_base64_value(search_object.order_by) : search_object.send(field)))
+              html << hidden_field(name, field, :object => search_object, :id => "#{name}_#{field}_#{options.object_id}", :value => (field == :order_by ? searchlogic_base64_value(search_object.order_by) : search_object.send(field)))
+            end
               
-              # For edge rails and older version compatibility, passing a binding to concat was deprecated
-              begin
-                concat(html)
-              rescue ArgumentError, NameError
-                concat(html, block.binding)
-              end
+            # For edge rails and older version compatibility, passing a binding to concat was deprecated
+            begin
+              concat(content_tag(:div, html, :style => 'margin:0;padding:0'))
+            rescue ArgumentError, NameError
+              concat(content_tag(:div, html, :style => 'margin:0;padding:0'), block.binding)
             end
             args << options
           end

data/lib/searchlogic/search/base.rb

@@ -11,7 +11,7 @@ module Searchlogic #:nodoc:
       AR_FIND_OPTIONS = ::ActiveRecord::Base.valid_find_options
       
       # Options ActiveRecord allows when performing calculations
-      AR_CALCULATIONS_OPTIONS = (::ActiveRecord::Base.valid_calculations_options - [:select, :limit, :offset, :order, :group])
+      AR_CALCULATIONS_OPTIONS = (::ActiveRecord::Base.valid_calculations_options - [:select, :limit, :offset, :order, :group, :include])
       
       AR_OPTIONS = (AR_FIND_OPTIONS + AR_CALCULATIONS_OPTIONS).uniq
       
@@ -120,8 +120,8 @@ module Searchlogic #:nodoc:
       end
       
       def select
-        return @select if klass.connection.adapter_name == "PostgreSQL" # Postgres needs ALL of the column names here, including association columns, etc. Which is very strange, so I disable this feature for Postgres all together.
-        @select ||= "DISTINCT #{klass.connection.quote_table_name(klass.table_name)}.*" if !joins.blank? && Config.search.remove_duplicates?
+        @select ||= "DISTINCT #{klass.connection.quote_table_name(klass.table_name)}.*" if !joins.blank? && Config.search.remove_duplicates? && klass.connection.adapter_name != "PostgreSQL"
+        @select
       end
       
       def scope

data/lib/searchlogic/search/searching.rb

@@ -18,7 +18,7 @@ module Searchlogic
               options = sanitize(#{SEARCH_METHODS.include?(method)})
               if #{CALCULATION_METHODS.include?(method)}
                 options[:distinct] = true if #{method == :count} && !joins.blank? && Config.search.remove_duplicates?
-                args[0] = klass.primary_key if [nil, :all].include?(args[0])
+                args[0] = klass.column_names.first if [nil, :all].include?(args[0])
               end
               args << options
               results = klass.#{method}(*args)

data/lib/searchlogic/version.rb

@@ -67,7 +67,7 @@ module Searchlogic
 
     MAJOR = 1
     MINOR = 6
-    TINY  = 2
+    TINY  = 3
 
     # The current version as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/searchlogic.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "1.6.2"
+  s.version = "1.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Johnson of Binary Logic"]
-  s.date = %q{2008-12-13}
+  s.date = %q{2009-02-02}
   s.description = %q{Object based ActiveRecord searching, ordering, pagination, and more!}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = ["CHANGELOG.rdoc", "lib/searchlogic/active_record/associations.rb", "lib/searchlogic/active_record/base.rb", "lib/searchlogic/active_record/connection_adapters/mysql_adapter.rb", "lib/searchlogic/active_record/connection_adapters/postgresql_adapter.rb", "lib/searchlogic/active_record/connection_adapters/sqlite_adapter.rb", "lib/searchlogic/condition/base.rb", "lib/searchlogic/condition/begins_with.rb", "lib/searchlogic/condition/blank.rb", "lib/searchlogic/condition/child_of.rb", "lib/searchlogic/condition/descendant_of.rb", "lib/searchlogic/condition/ends_with.rb", "lib/searchlogic/condition/equals.rb", "lib/searchlogic/condition/greater_than.rb", "lib/searchlogic/condition/greater_than_or_equal_to.rb", "lib/searchlogic/condition/inclusive_descendant_of.rb", "lib/searchlogic/condition/keywords.rb", "lib/searchlogic/condition/less_than.rb", "lib/searchlogic/condition/less_than_or_equal_to.rb", "lib/searchlogic/condition/like.rb", "lib/searchlogic/condition/nested_set.rb", "lib/searchlogic/condition/nil.rb", "lib/searchlogic/condition/not_begin_with.rb", "lib/searchlogic/condition/not_blank.rb", "lib/searchlogic/condition/not_end_with.rb", "lib/searchlogic/condition/not_equal.rb", "lib/searchlogic/condition/not_have_keywords.rb", "lib/searchlogic/condition/not_like.rb", "lib/searchlogic/condition/not_nil.rb", "lib/searchlogic/condition/sibling_of.rb", "lib/searchlogic/conditions/any_or_all.rb", "lib/searchlogic/conditions/base.rb", "lib/searchlogic/conditions/groups.rb", "lib/searchlogic/conditions/magic_methods.rb", "lib/searchlogic/conditions/multiparameter_attributes.rb", "lib/searchlogic/conditions/protection.rb", "lib/searchlogic/config/helpers.rb", "lib/searchlogic/config/search.rb", "lib/searchlogic/config.rb", "lib/searchlogic/core_ext/hash.rb", "lib/searchlogic/core_ext/object.rb", "lib/searchlogic/helpers/control_types/link.rb", "lib/searchlogic/helpers/control_types/links.rb", "lib/searchlogic/helpers/control_types/remote_link.rb", "lib/searchlogic/helpers/control_types/remote_links.rb", "lib/searchlogic/helpers/control_types/remote_select.rb", "lib/searchlogic/helpers/control_types/select.rb", "lib/searchlogic/helpers/form.rb", "lib/searchlogic/helpers/utilities.rb", "lib/searchlogic/modifiers/absolute.rb", "lib/searchlogic/modifiers/acos.rb", "lib/searchlogic/modifiers/asin.rb", "lib/searchlogic/modifiers/atan.rb", "lib/searchlogic/modifiers/avg.rb", "lib/searchlogic/modifiers/base.rb", "lib/searchlogic/modifiers/ceil.rb", "lib/searchlogic/modifiers/char_length.rb", "lib/searchlogic/modifiers/cos.rb", "lib/searchlogic/modifiers/cot.rb", "lib/searchlogic/modifiers/count.rb", "lib/searchlogic/modifiers/day_of_month.rb", "lib/searchlogic/modifiers/day_of_week.rb", "lib/searchlogic/modifiers/day_of_year.rb", "lib/searchlogic/modifiers/degrees.rb", "lib/searchlogic/modifiers/exp.rb", "lib/searchlogic/modifiers/floor.rb", "lib/searchlogic/modifiers/hex.rb", "lib/searchlogic/modifiers/hour.rb", "lib/searchlogic/modifiers/log.rb", "lib/searchlogic/modifiers/log10.rb", "lib/searchlogic/modifiers/log2.rb", "lib/searchlogic/modifiers/lower.rb", "lib/searchlogic/modifiers/ltrim.rb", "lib/searchlogic/modifiers/md5.rb", "lib/searchlogic/modifiers/microseconds.rb", "lib/searchlogic/modifiers/milliseconds.rb", "lib/searchlogic/modifiers/minute.rb", "lib/searchlogic/modifiers/month.rb", "lib/searchlogic/modifiers/octal.rb", "lib/searchlogic/modifiers/radians.rb", "lib/searchlogic/modifiers/round.rb", "lib/searchlogic/modifiers/rtrim.rb", "lib/searchlogic/modifiers/second.rb", "lib/searchlogic/modifiers/sign.rb", "lib/searchlogic/modifiers/sin.rb", "lib/searchlogic/modifiers/square_root.rb", "lib/searchlogic/modifiers/sum.rb", "lib/searchlogic/modifiers/tan.rb", "lib/searchlogic/modifiers/trim.rb", "lib/searchlogic/modifiers/upper.rb", "lib/searchlogic/modifiers/week.rb", "lib/searchlogic/modifiers/year.rb", "lib/searchlogic/search/base.rb", "lib/searchlogic/search/conditions.rb", "lib/searchlogic/search/ordering.rb", "lib/searchlogic/search/pagination.rb", "lib/searchlogic/search/protection.rb", "lib/searchlogic/search/searching.rb", "lib/searchlogic/shared/utilities.rb", "lib/searchlogic/shared/virtual_classes.rb", "lib/searchlogic/version.rb", "lib/searchlogic.rb", "README.rdoc", "TODO.rdoc"]

data/test/active_record_tests/base_test.rb

@@ -104,5 +104,12 @@ module ActiveRecordTests
     def test_includes
       assert_nothing_raised { Account.all(:conditions => {:users => {:first_name_like => "Ben"}}, :include => :users) }
     end
+    
+    def test_remove_duplicate_joins
+      query = "SELECT DISTINCT `ticket_groups`.* FROM `ticket_groups` INNER JOIN tickets ON ticket_groups.id = tickets.ticket_group_id     LEFT OUTER JOIN `tickets` ON tickets.ticket_group_id = ticket_groups.id  WHERE (`tickets`.`id` = 2) AND ((`tickets`.event_id = 810802042))  LIMIT 20"
+      cleaned_query = ActiveRecord::Base.send(:remove_duplicate_joins, query)
+      expected_query = "SELECT DISTINCT `ticket_groups`.* FROM `ticket_groups` INNER JOIN tickets ON ticket_groups.id = tickets.ticket_group_id WHERE (`tickets`.`id` = 2) AND ((`tickets`.event_id = 810802042)) LIMIT 20"
+      assert_equal expected_query, cleaned_query
+    end
   end
 end

data/test/conditions_tests/base_test.rb

@@ -174,5 +174,12 @@ module ConditionsTests
       conditions.reset!
       assert_equal [], conditions.send(:objects)
     end
+    
+    def test_join_with_or_with_association
+      conditions = Searchlogic::Cache::AccountConditions.new
+      conditions.name_ends_with = "Binary"
+      conditions.users.or_first_name_like = "whatever"
+      assert_equal ["\"accounts\".\"name\" LIKE ? OR \"users\".\"first_name\" LIKE ?", "%Binary", "%whatever%"], conditions.sanitize
+    end
   end
 end

data/test/conditions_tests/groups_test.rb

@@ -48,5 +48,21 @@ module ConditionsTests
       ])
       assert_equal ["\"accounts\".\"id\" > ? AND (\"accounts\".\"name\" LIKE ?) AND (\"accounts\".\"id\" > ? AND (\"accounts\".\"id\" < ? AND \"accounts\".\"created_at\" > ?))", 3, "%Binary%", 5, 20, now], conditions.sanitize
     end
+    
+    def test_auto_joins
+      conditions = Searchlogic::Cache::AccountConditions.new
+      conditions.group do |g|
+        g.users.first_name_like = "Ben"
+      end
+      assert_equal :users, conditions.auto_joins
+      
+      search = Searchlogic::Cache::AccountSearch.new
+      search.conditions.users.first_name_like = "Ben"
+      search.conditions.group do |g|
+        g.users.orders.id_gt = 5
+      end
+      assert_equal [:users, {:users => :orders}], search.conditions.auto_joins
+      assert_nothing_raised { search.all }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchlogic
 version: !ruby/object:Gem::Version 
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-13 00:00:00 -05:00
+date: 2009-02-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency