primary keys should not be cleared on cache clear, fixing oracle tests

5 files changed, 15 insertions, 6 deletions

diff --git a/activerecord/lib/active_record/attribute_methods/primary_key.rb b/activerecord/lib/active_record/attribute_methods/primary_key.rb
index 978cd7fbe3..fcdd31ddea 100644
--- a/activerecord/lib/active_record/attribute_methods/primary_key.rb
+++ b/activerecord/lib/active_record/attribute_methods/primary_key.rb
@@ -56,6 +56,7 @@ module ActiveRecord
           @primary_key ||= ''
           self.original_primary_key = @primary_key
           value &&= value.to_s
+          connection_pool.primary_keys[table_name] = value
           self.primary_key = block_given? ? instance_eval(&block) : value
         end
       end
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
index b1754e61df..4297c26413 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -128,12 +128,10 @@ module ActiveRecord
       #
       #   * columns
       #   * columns_hash
-      #   * primary_keys
       #   * tables
       def clear_cache!
         @columns.clear
         @columns_hash.clear
-        @primary_keys.clear
         @tables.clear
       end
 
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,
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 1730d9fb56..20a16cc8ac 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -50,6 +50,11 @@ class Boolean < ActiveRecord::Base; end
 class BasicsTest < ActiveRecord::TestCase
   fixtures :topics, :companies, :developers, :projects, :computers, :accounts, :minimalistics, 'warehouse-things', :authors, :categorizations, :categories, :posts
 
+  def test_columns_should_obey_set_primary_key
+    pk = Subscriber.columns.find { |x| x.name == 'nick' }
+    assert pk.primary, 'nick should be primary key'
+  end
+
   def test_primary_key_with_no_id
     assert_nil Edge.primary_key
   end
diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb
index 55ac1bc406..0c545b7e9d 100644
--- a/activerecord/test/cases/connection_pool_test.rb
+++ b/activerecord/test/cases/connection_pool_test.rb
@@ -18,16 +18,14 @@ module ActiveRecord
         assert_equal columns_hash, @pool.columns_hash['posts']
       end
 
-      def test_clearing_cache
+      def test_clearing_column_cache
         @pool.columns['posts']
         @pool.columns_hash['posts']
-        @pool.primary_keys['posts']
 
         @pool.clear_cache!
 
         assert_equal 0, @pool.columns.size
         assert_equal 0, @pool.columns_hash.size
-        assert_equal 0, @pool.primary_keys.size
       end
 
       def test_primary_key