Skip to content

Commit d6a1950

Browse files
committed
[MODEL] Refactored the if/elsif statement from 5fb9c56 into case
Related: elastic#369, elastic#370
1 parent 61759f1 commit d6a1950

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

elasticsearch-model/lib/elasticsearch/model/adapters/multiple.rb

+4-3
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,12 @@ def __records_by_type
5353
def __records_for_klass(klass, ids)
5454
adapter = __adapter_for_klass(klass)
5555

56-
if Elasticsearch::Model::Adapter::ActiveRecord.equal?(adapter)
56+
case
57+
when Elasticsearch::Model::Adapter::ActiveRecord.equal?(adapter)
5758
klass.where(klass.primary_key => ids)
58-
elsif Elasticsearch::Model::Adapter::Mongoid.equal?(adapter)
59+
when Elasticsearch::Model::Adapter::Mongoid.equal?(adapter)
5960
klass.where(:id.in => ids)
60-
else
61+
else
6162
klass.find(ids)
6263
end
6364
end

elasticsearch-model/test/integration/multiple_models_test.rb

+1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ class ::Series < ActiveRecord::Base
8888

8989
should "only retrieve records for existing results" do
9090
::Series.find_by_name("The greatest Series").delete
91+
::Series.__elasticsearch__.refresh_index!
9192
response = Elasticsearch::Model.search("\"The greatest Episode\"^2 OR \"The greatest Series\"", [Series, Episode])
9293

9394
assert response.any?, "Response should not be empty: #{response.to_a.inspect}"

0 commit comments

Comments
 (0)