Revert "This fixes lighthouse#1475, results incorrectly marked as imm…

…utable"
datamapper · May 24, 2016 · b30017e · b30017e
1 parent 33be2ac
commit b30017e
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/lib/dm-core/model.rb b/lib/dm-core/model.rb
@@ -593,8 +593,7 @@ def load(records, query)
             model     = discriminator && discriminator.load(record[discriminator]) || self
             model_key = model.key(repository_name)
 
-            key_values = model_key.zip(record.values_at(*model_key)).map { |k,v| k.load(v) }
-            resource = if model_key.valid?(key_values)
+            resource = if model_key.valid?(key_values = record.values_at(*model_key))
               identity_map = repository.identity_map(model)
               identity_map[key_values]
             end