Should clear the primary keys cache also

2 files changed, 6 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/schema_cache.rb b/activerecord/lib/active_record/connection_adapters/schema_cache.rb
index da507fd3ae..4e8932a695 100644
--- a/activerecord/lib/active_record/connection_adapters/schema_cache.rb
+++ b/activerecord/lib/active_record/connection_adapters/schema_cache.rb
@@ -34,6 +34,7 @@ module ActiveRecord
       def clear!
         @columns.clear
         @columns_hash.clear
+        @primary_keys.clear
         @tables.clear
       end
 
diff --git a/activerecord/test/cases/connection_adapters/schema_cache_test.rb b/activerecord/test/cases/connection_adapters/schema_cache_test.rb
index cd98bf90cf..42e39d534c 100644
--- a/activerecord/test/cases/connection_adapters/schema_cache_test.rb
+++ b/activerecord/test/cases/connection_adapters/schema_cache_test.rb
@@ -26,14 +26,18 @@ module ActiveRecord
         assert_equal columns_hash, @cache.columns_hash['posts']
       end
 
-      def test_clearing_column_cache
+      def test_clearing
         @cache.columns['posts']
         @cache.columns_hash['posts']
+        @cache.tables['posts']
+        @cache.primary_keys['posts']
 
         @cache.clear!
 
         assert_equal 0, @cache.columns.size
         assert_equal 0, @cache.columns_hash.size
+        assert_equal 0, @cache.tables.size
+        assert_equal 0, @cache.primary_keys.size
       end
     end
   end