Merge branch 'pg_search_rank' into staging_rails4

Victor Costa
2 parents 749483e4 4c0bdaad
Showing 1 changed file with 2 additions and 3 deletions Show diff stats
plugins/pg_search/lib/ext/active_record.rb
@@ -4,9 +4,8 @@ class ActiveRecord::Base
   def self.pg_search_plugin_search(query)
     filtered_query = query.gsub(/[\|\(\)\\\/\s\[\]'"*%&!:]/,' ').split.map{|w| w += ":*"}.join('|')
     if defined?(self::SEARCHABLE_FIELDS)
-      select("*,ts_rank(to_tsvector('simple', #{pg_search_plugin_fields}), to_tsquery('#{filtered_query}')) as rank").
-        where("to_tsvector('simple', #{pg_search_plugin_fields}) @@ to_tsquery('#{filtered_query}')").
-        order("rank DESC")
+      where("to_tsvector('simple', #{pg_search_plugin_fields}) @@ to_tsquery('#{filtered_query}')").
+        order("ts_rank(to_tsvector('simple', #{pg_search_plugin_fields}), to_tsquery('#{filtered_query}')) DESC")
     else
       raise "No searchable fields defined for #{self.name}"
     end
...	...	@@ -4,9 +4,8 @@ class ActiveRecord::Base
4	4	def self.pg_search_plugin_search(query)
5	5	filtered_query = query.gsub(/[\\|\(\)\\\/\s\[\]'"%&!:]/,' ').split.map{\|w\| w += ":"}.join('\|')
6	6	if defined?(self::SEARCHABLE_FIELDS)
7		- select("*,ts_rank(to_tsvector('simple', #{pg_search_plugin_fields}), to_tsquery('#{filtered_query}')) as rank").
8		- where("to_tsvector('simple', #{pg_search_plugin_fields}) @@ to_tsquery('#{filtered_query}')").
9		- order("rank DESC")
	7	+ where("to_tsvector('simple', #{pg_search_plugin_fields}) @@ to_tsquery('#{filtered_query}')").
	8	+ order("ts_rank(to_tsvector('simple', #{pg_search_plugin_fields}), to_tsquery('#{filtered_query}')) DESC")
10	9	else
11	10	raise "No searchable fields defined for #{self.name}"
12	11	end
...	...