github / searchkick

Download as
Browse Code ยป

Commit 76656c6bf9283c9718045b3fa06a6f562a3b5d30

Authored by Andrew Kane
1 parent 4c23cb6b
Exists in master and in 21 other branches allow_missing, conversions_period, conversions_v2, eager_load, find_in_batches, highlighted, index_name, lazy_index_name, less_deps, nested, reindex_async_threads, reindex_refactor, relation, relation_search, routing_queue, scope_attributes, search_as_you_type, synonyms_ci, test_language, threads, wildcard

Reverted treat _id and id differently - #203

Showing 3 changed files with 5 additions and 4 deletions   Show diff stats
1 -## 0.8.0 [unreleased] 1 +## 0.7.6 [unreleased]
2 2
3 -- Treat `id` and `_id` differently  
4 - Added `stats` option to facets 3 - Added `stats` option to facets
5 - Added `padding` option 4 - Added `padding` option
6 5
lib/searchkick/index.rb
  Diff comments   View file @76656c6
@@ -86,7 +86,6 @@ module Searchkick @@ -86,7 +86,6 @@ module Searchkick
86 # stringify fields 86 # stringify fields
87 # remove _id since search_id is used instead 87 # remove _id since search_id is used instead
88 source = source.inject({}){|memo,(k,v)| memo[k.to_s] = v; memo}.except("_id") 88 source = source.inject({}){|memo,(k,v)| memo[k.to_s] = v; memo}.except("_id")
89 - source["id"] ||= search_id(record)  
90 89
91 # conversions 90 # conversions
92 conversions_field = options[:conversions] 91 conversions_field = options[:conversions]
lib/searchkick/query.rb
  Diff comments   View file @76656c6
@@ -195,7 +195,8 @@ module Searchkick @@ -195,7 +195,8 @@ module Searchkick
195 195
196 # order 196 # order
197 if options[:order] 197 if options[:order]
198 - payload[:sort] = options[:order].is_a?(Enumerable) ? options[:order] : {options[:order] => :asc} 198 + order = options[:order].is_a?(Enumerable) ? options[:order] : {options[:order] => :asc}
  199 + payload[:sort] = Hash[ order.map{|k, v| [k.to_s == "id" ? :_id : k, v] } ]
199 end 200 end
200 201
201 # filters 202 # filters
@@ -382,6 +383,8 @@ module Searchkick @@ -382,6 +383,8 @@ module Searchkick
382 def where_filters(where) 383 def where_filters(where)
383 filters = [] 384 filters = []
384 (where || {}).each do |field, value| 385 (where || {}).each do |field, value|
  386 + field = :_id if field.to_s == "id"
  387 +
385 if field == :or 388 if field == :or
386 value.each do |or_clause| 389 value.each do |or_clause|
387 filters << {or: or_clause.map{|or_statement| {and: where_filters(or_statement)} }} 390 filters << {or: or_clause.map{|or_statement| {and: where_filters(or_statement)} }}