@@ -1,6 +1,7 @@ == 1.5.4 released 2008-10-30 * Removed subclass requirement for adding conditions in Conditions::Base +* Removed DISTINCT in the select clause, instead called uniq! on the results. PostgreSQL complains about DISTINCT and AR uses uniq! when using :includes, so this is the best option. == 1.5.3 released 2008-10-30 CHANGELOG.rdoc @@ -1,6 +1,4 @@ = To Do 1. Perform "more efficient" checks: year_of_created_at = 2008 and month_of_created_at = 8. Should result in a "BETWEEN" statement utilizing the column indexes. Thanks Georg for letting me know about this. -2. Solve conflicts between scope joins and joins in the search (for old versions of AR). Also solve conflicts between joins and includes. -3. Add configuration to change the "english" words -4. Re-add the distinct option \ No newline at end of file +2. Solve conflicts between scope joins and joins in the search (for old versions of AR). Also solve conflicts between joins and includes. \ No newline at end of file TODO.rdoc @@ -119,11 +119,6 @@ module Searchlogic #:nodoc: find_options end - def select - @select ||= "DISTINCT #{klass.connection.quote_table_name(klass.table_name)}.*" if !joins.blank? && Config.search.remove_duplicates? - @select - end - def scope @scope ||= {} end lib/searchlogic/search/base.rb @@ -21,7 +21,9 @@ module Searchlogic args[0] = klass.primary_key if [nil, :all].include?(args[0]) end args << options - klass.#{method}(*args) + results = klass.#{method}(*args) + results.uniq! if #{SEARCH_METHODS.include?(method)} && results.is_a?(Array) && !joins.blank? && Config.search.remove_duplicates? + results end end end_eval lib/searchlogic/search/searching.rb @@ -142,7 +142,7 @@ module SearchTests search.conditions.users.id_greater_than = 2 search.page = 3 search.readonly = true - assert_equal_find_options({:joins => :users, :offset => 4, :select => "DISTINCT \"accounts\".*", :readonly => true, :conditions => ["(\"accounts\".\"name\" LIKE ?) AND (\"users\".\"id\" > ?)", "%Binary%", 2], :limit => 2 }, search.sanitize) + assert_equal_find_options({:joins => :users, :offset => 4, :readonly => true, :conditions => ["(\"accounts\".\"name\" LIKE ?) AND (\"users\".\"id\" > ?)", "%Binary%", 2], :limit => 2 }, search.sanitize) end def test_scope test/search_tests/base_test.rb examples/README.rdoc 8e0971f4c32c62dd1ea747e3da174d2f5178aa40 binarylogic bjohnson@binarylogic.com http://github.com/binarylogic/searchlogic/commit/ae9147bce4e4cd7a3aa6a2f339eb9da9089bb645 ae9147bce4e4cd7a3aa6a2f339eb9da9089bb645 2008-11-13T21:47:38-08:00 2008-11-13T21:47:38-08:00 Removed DISTINCT in select, useed uniq! on results instead 05868c4b56893de725f86b812e1aaa874187bab3 binarylogic bjohnson@binarylogic.com