searchlogic 1.6.1 → 1.6.2

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 1.6.2 released 2008-12-13
+
+* Remove duplicate joins at a lower level for a cleaner and less brittle approach.
+
 == 1.6.1 released 2008-12-8
 
 * Group multi faceted conditions since we allow for the mix of "and" and "or"

data/lib/searchlogic/active_record/base.rb

@@ -104,6 +104,47 @@ module Searchlogic
       end
     
       private
+        def construct_finder_sql_with_included_associations_with_searchlogic(*args)
+          sql = construct_finder_sql_with_included_associations_without_searchlogic(*args)
+          remove_duplicate_joins(sql)
+        end
+        
+        def construct_finder_sql_with_searchlogic(*args)
+          sql = construct_finder_sql_without_searchlogic(*args)
+          remove_duplicate_joins(sql)
+        end
+        
+        def construct_calculation_sql_with_searchlogic(*args)
+          sql = construct_calculation_sql_without_searchlogic(*args)
+          remove_duplicate_joins(sql)
+        end
+        
+        def remove_duplicate_joins(sql)
+          join_expr = /(LEFT OUTER JOIN|INNER JOIN)/i
+          sql_parts = sql.split(join_expr)
+          if !sql_parts.empty?
+            last_parts = sql_parts.pop.split(/ (?!ON|AS)([A-Z]+) /)
+            sql_parts += last_parts
+            is_join_statement = false
+            cleaned_parts = []
+            sql_parts.each do |part|
+              part = part.strip
+              if is_join_statement
+                if !cleaned_parts.include?(part)
+                  cleaned_parts << part
+                else
+                  cleaned_parts.pop
+                end
+              else
+                cleaned_parts << part
+              end
+              is_join_statement = part =~ join_expr
+            end
+            sql = cleaned_parts.join(" ")
+          end
+          sql
+        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
@@ -153,6 +194,9 @@ module ActiveRecord #:nodoc: all
   class Base
     class << self
       alias_method_chain :calculate, :searchlogic
+      alias_method_chain :construct_finder_sql, :searchlogic
+      alias_method_chain :construct_finder_sql_with_included_associations, :searchlogic
+      alias_method_chain :construct_calculation_sql, :searchlogic
       alias_method_chain :find, :searchlogic
       alias_method_chain :with_scope, :searchlogic
       alias_method :new_search, :build_search
@@ -165,54 +209,6 @@ module ActiveRecord #:nodoc: all
       def valid_calculations_options
         Calculations::CALCULATIONS_OPTIONS
       end
-      
-      private
-        # This is copied over from 2 different versions of ActiveRecord. I have to do this in order to preserve the "auto joins"
-        # as symbols. Keeping them as symbols allows ActiveRecord to merge them properly. The problem is when they conflict with includes.
-        # Includes add joins also, and they add them before joins do. So if they already added them skip them. Now you can do queries like:
-        #
-        # User.all(:joins => {:orders => :line_items}, :include => :orders)
-        #
-        # Where as before, the only way to get the above query to work would be to include line_items also, which is not neccessarily what you want.
-        def add_joins!(sql, options_or_joins, scope = :auto) # :nodoc:
-          code_type = (respond_to?(:array_of_strings?, true) && :array_of_strings) || (respond_to?(:merge_joins, true) && :merge_joins)
-
-          case code_type
-          when :array_of_strings, :merge_joins
-            joins = options_or_joins
-            scope = scope(:find) if :auto == scope
-            merged_joins = scope && scope[:joins] && joins ? merge_joins(scope[:joins], joins) : (joins || scope && scope[:joins])
-            case merged_joins
-            when Symbol, Hash, Array
-              if code_type == :array_of_strings && array_of_strings?(merged_joins)
-                merged_joins.each { |merged_join| sql << " #{merged_join} " unless sql.include?(merged_join) }
-              else
-                join_dependency = ActiveRecord::Associations::ClassMethods::InnerJoinDependency.new(self, merged_joins, nil)
-                join_dependency.join_associations.each do |assoc|
-                  join_sql = assoc.association_join
-                  sql << " #{join_sql} " unless sql.include?(join_sql)
-                end
-              end
-            when String
-              sql << " #{merged_joins} " if merged_joins && !sql.include?(merged_joins)
-            end
-          else
-            options = options_or_joins
-            scope = scope(:find) if :auto == scope
-            [(scope && scope[:joins]), options[:joins]].each do |join|
-              case join
-              when Symbol, Hash, Array
-                join_dependency = ActiveRecord::Associations::ClassMethods::InnerJoinDependency.new(self, join, nil)
-                join_dependency.join_associations.each do |assoc|
-                  join_sql = assoc.association_join
-                  sql << " #{join_sql} " unless sql.include?(join_sql)
-                end
-              else
-                sql << " #{join} " if join && !sql.include?(join)
-              end
-            end
-          end
-        end
     end
   end
 end

data/lib/searchlogic/version.rb

@@ -67,7 +67,7 @@ module Searchlogic
 
     MAJOR = 1
     MINOR = 6
-    TINY  = 1
+    TINY  = 2
 
     # 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.1"
+  s.version = "1.6.2"
 
   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-11}
+  s.date = %q{2008-12-13}
   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"]

metadata

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