Skip to content

Commit 8d6473e

Browse files
pepekarmi
authored andcommitted
[STORE] Fixed, that search respects document_type set in class
Closes #77
1 parent 24ca0da commit 8d6473e

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

elasticsearch-persistence/lib/elasticsearch/persistence/repository/search.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ module Search
4040
# @return [Elasticsearch::Persistence::Repository::Response::Results]
4141
#
4242
def search(query_or_definition, options={})
43-
type = (klass ? __get_type_from_class(klass) : nil )
43+
type = document_type || (klass ? __get_type_from_class(klass) : nil )
4444
case
4545
when query_or_definition.respond_to?(:to_hash)
4646
response = client.search( { index: index_name, type: type, body: query_or_definition.to_hash }.merge(options) )

elasticsearch-persistence/test/unit/repository_search_test.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ class MyDocument; end
88
@shoulda_subject = Class.new() { include Elasticsearch::Persistence::Repository::Search }.new
99

1010
@client = mock
11+
@shoulda_subject.stubs(:document_type).returns(nil)
1112
@shoulda_subject.stubs(:klass).returns(nil)
1213
@shoulda_subject.stubs(:index_name).returns('test')
1314
@shoulda_subject.stubs(:client).returns(@client)

0 commit comments

Comments
 (0)