Reverted treat _id and id differently - #203

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