Skip to content

Add custom primary key support #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Add custom primary key support #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion elasticsearch-model/lib/elasticsearch/model/adapters/active_record.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module Records
# Returns an `ActiveRecord::Relation` instance
#
def records
sql_records = klass.where(id: ids)
sql_records = klass.where(klass.primary_key => ids)

# Re-order records based on the order from Elasticsearch hits
# by redefining `to_a`, unless the user has called `order()`
Expand Down
6 changes: 3 additions & 3 deletions elasticsearch-model/test/unit/adapter_active_record_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def ids
assert_instance_of Module, Elasticsearch::Model::Adapter::ActiveRecord::Records

instance = DummyClassForActiveRecord.new
instance.expects(:klass).returns(mock('class', where: @records))
instance.expects(:klass).returns(mock('class', primary_key: :some_key, where: @records)).at_least_once

assert_equal @records, instance.records
end
Expand All @@ -55,7 +55,7 @@ def ids
@records.instance_variable_set(:@records, @records)

instance = DummyClassForActiveRecord.new
instance.expects(:klass).returns(mock('class', where: @records))
instance.expects(:klass).returns(mock('class', primary_key: :some_key, where: @records)).at_least_once

assert_equal [1, 2], @records. to_a.map(&:id)
assert_equal [2, 1], instance.records.to_a.map(&:id)
Expand All @@ -65,7 +65,7 @@ def ids
@records.instance_variable_set(:@records, @records)

instance = DummyClassForActiveRecord.new
instance.expects(:klass).returns(stub('class', where: @records)).at_least_once
instance.expects(:klass).returns(stub('class', primary_key: :some_key, where: @records)).at_least_once
instance.records.expects(:order).returns(@records)

assert_equal [2, 1], instance.records. to_a.map(&:id)
Expand Down