aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/identity_map.rb
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2010-09-20 12:04:44 -0300
committerEmilio Tagua <miloops@gmail.com>2010-11-19 19:08:10 -0300
commit0f169493a2614328986f6f4a8c2c7a1943223747 (patch)
treeb3721dc359196d74689c918e62f0c827de3c0b59 /activerecord/lib/active_record/identity_map.rb
parenta3210d90be844b306bbbf3324c7ad1ad389a14b9 (diff)
downloadrails-0f169493a2614328986f6f4a8c2c7a1943223747.tar.gz
rails-0f169493a2614328986f6f4a8c2c7a1943223747.tar.bz2
rails-0f169493a2614328986f6f4a8c2c7a1943223747.zip
Use strings primary keys in identity map keys to avoid problems with casting and also allow strings primary keys.
Diffstat (limited to 'activerecord/lib/active_record/identity_map.rb')
-rw-r--r--activerecord/lib/active_record/identity_map.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/identity_map.rb b/activerecord/lib/active_record/identity_map.rb
index c0fab27188..57fcfb5110 100644
--- a/activerecord/lib/active_record/identity_map.rb
+++ b/activerecord/lib/active_record/identity_map.rb
@@ -29,15 +29,15 @@ module ActiveRecord
end
def get(class_name, primary_key)
- current[[class_name, primary_key]]
+ current[[class_name, primary_key.to_s]]
end
def add(record)
- current[[record.class.name, record.id]] = record
+ current[[record.class.name, record.id.to_s]] = record
end
def remove(record)
- current.delete([record.class.name, record.id])
+ current.delete([record.class.name, record.id.to_s])
end
def clear