From: Tom Hughes <tom@compton.nu>
Date: Fri, 8 May 2009 17:56:12 +0000 (+0000)
Subject: Patch composite_primary_keys to work around issue when one component of
X-Git-Tag: live~7397
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3a0f4d30cf6cbe921ffa2a78e5a0192c32a86ef4?ds=inline

Patch composite_primary_keys to work around issue when one component of
a composite key is called "id".
---

diff --git a/vendor/gems/composite_primary_keys-2.2.2/lib/composite_primary_keys/association_preload.rb b/vendor/gems/composite_primary_keys-2.2.2/lib/composite_primary_keys/association_preload.rb
index 00b343c4e..56b2b9c73 100644
--- a/vendor/gems/composite_primary_keys-2.2.2/lib/composite_primary_keys/association_preload.rb
+++ b/vendor/gems/composite_primary_keys-2.2.2/lib/composite_primary_keys/association_preload.rb
@@ -114,7 +114,7 @@ module CompositePrimaryKeys
             id_map = {}
 
             records.each do |record|
-              key = primary_key_name.map{|k| record.send(k)}
+              key = primary_key_name.map{|k| record.attributes[k]}
               key_as_string = key.join(CompositePrimaryKeys::ID_SEP)
 
               if key_as_string