Skip to content
This repository was archived by the owner on Apr 17, 2018. It is now read-only.

Commit 8531b95

Browse files
committed
Merge pull request #299 from datamapper/revert-185-fix-for-lighthouse-1475
Revert "This fixes lighthouse#1475, results incorrectly marked as immutable"
2 parents 33be2ac + b30017e commit 8531b95

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

lib/dm-core/model.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -593,8 +593,7 @@ def load(records, query)
593593
model = discriminator && discriminator.load(record[discriminator]) || self
594594
model_key = model.key(repository_name)
595595

596-
key_values = model_key.zip(record.values_at(*model_key)).map { |k,v| k.load(v) }
597-
resource = if model_key.valid?(key_values)
596+
resource = if model_key.valid?(key_values = record.values_at(*model_key))
598597
identity_map = repository.identity_map(model)
599598
identity_map[key_values]
600599
end

0 commit comments

Comments
 (0)