Remove duplicates regardless of where searchgasm is used

CHANGELOG.rdoc

@@ -1,6 +1,6 @@
 == 1.4.1 released 2008-10-08
 
-* Extracted english text into configuration to support alternate languages.
+* Extracted english text into configuration to support alternate languages. I18n support.
 
 == 1.4.0 released 2008-10-08
 

lib/searchgasm/search/base.rb

@@ -83,24 +83,9 @@ def inspect
       # Merges all joins together, including the scopes joins for
       def joins
         all_joins = (safe_to_array(conditions.auto_joins) + safe_to_array(order_by_auto_joins) + safe_to_array(priority_order_by_auto_joins) + safe_to_array(@joins)).uniq
-        # For partial backwards compatibility, delete if the scope contains conflicts, AR 2.2 does this for you
-        scope_joins = safe_to_array(scope && scope[:joins])
-        all_joins.delete_if { |j| scope_joins.include?(j) } unless scope_joins.blank?
         all_joins.size <= 1 ? all_joins.first : all_joins
       end
-=begin
-      def joins
-        auto_joins = joins_to_sql_array((safe_to_array(conditions.auto_joins) + safe_to_array(order_by_auto_joins) + safe_to_array(priority_order_by_auto_joins)).uniq)
-        scope_joins = joins_to_sql_array(scope && scope[:joins])
-        include_joins = joins_to_sql_array(include)
-        
-        #raise auto_joins.inspect if conditions.respond_to?(:dogs) && conditions.dogs.id == 1
-        
-        auto_joins.delete_if { |auto_join| scope_joins.include?(auto_join) || include_joins.include?(auto_join) }
-        
-        #raise auto_joins.inspect if auto_joins.size > 1
-      end
-=end
+
       def limit=(value)
         @set_limit = true
         @limit = value.blank? || value == 0 ? nil : value.to_i
@@ -134,6 +119,11 @@ def sanitize(searching = true)
         find_options
       end
 
+      def select
+        @select ||= "DISTINCT #{klass.connection.quote_table_name(klass.table_name)}.*" if !joins.blank? && Config.remove_duplicates?
+        @select
+      end
+
       def scope
         @scope ||= {}
       end

lib/searchgasm/search/searching.rb

@@ -21,9 +21,7 @@ def #{method}(*args)
                 args[0] = klass.primary_key if [nil, :all].include?(args[0])
               end
               args << options
-              result = klass.#{method}(*args)
-              result.uniq! if result.is_a?(Array) && Config.remove_duplicates?
-              result
+              klass.#{method}(*args)
             end
           end
         end_eval

test/test_search_base.rb

@@ -141,7 +141,7 @@ def test_sanitize
     search.conditions.users.id_greater_than = 2
     search.page = 3
     search.readonly = true
-    assert_equal({:joins => :users, :offset => 4, :readonly => true, :conditions => ["(\"accounts\".\"name\" LIKE ?) AND (\"users\".\"id\" > ?)", "%Binary%", 2], :limit => 2 }, search.sanitize)
+    assert_equal({:joins => :users, :offset => 4, :select => "DISTINCT \"accounts\".*", :readonly => true, :conditions => ["(\"accounts\".\"name\" LIKE ?) AND (\"users\".\"id\" > ?)", "%Binary%", 2], :limit => 2 }, search.sanitize)
   end
 
   def test_scope