diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-02-08 16:01:16 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-02-08 16:01:16 -0800 |
| commit | 1c6f4562d788cd5b63889b9597bc1765a1bd75e0 (patch) | |
| tree | 675332c9f09d1f86b38f068371b64db6893d00fe /activerecord/lib/active_record/relation.rb | |
| parent | 11061f410eca48c3a1922ade001bc54927e6b8c7 (diff) | |
| download | rails-1c6f4562d788cd5b63889b9597bc1765a1bd75e0.tar.gz rails-1c6f4562d788cd5b63889b9597bc1765a1bd75e0.tar.bz2 rails-1c6f4562d788cd5b63889b9597bc1765a1bd75e0.zip | |
primary keys should not be cleared on cache clear, fixing oracle tests
Diffstat (limited to 'activerecord/lib/active_record/relation.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 1441e9750e..852f4077f2 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -32,7 +32,14 @@ module ActiveRecord def insert(values) im = arel.compile_insert values im.into @table - primary_key_value = primary_key && Hash === values ? values[table[primary_key]] : nil + + primary_key_value = nil + + if primary_key && Hash === values + primary_key_value = values[values.keys.find { |k| + k.name == primary_key + }] + end @klass.connection.insert( im.to_sql, |