1 files changed, 9 insertions, 63 deletions
diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb
index f92f4e62c5..d170a13b23 100644
--- a/activerecord/test/cases/connection_pool_test.rb
+++ b/activerecord/test/cases/connection_pool_test.rb
@@ -26,67 +26,6 @@ module ActiveRecord
         assert !@pool.active_connection?
       end
 
-      def test_pool_caches_columns
-        columns = @pool.columns['posts']
-        assert_equal columns, @pool.columns['posts']
-      end
-
-      def test_pool_caches_columns_hash
-        columns_hash = @pool.columns_hash['posts']
-        assert_equal columns_hash, @pool.columns_hash['posts']
-      end
-
-      def test_clearing_column_cache
-        @pool.columns['posts']
-        @pool.columns_hash['posts']
-
-        @pool.clear_cache!
-
-        assert_equal 0, @pool.columns.size
-        assert_equal 0, @pool.columns_hash.size
-      end
-
-      def test_primary_key
-        assert_equal 'id', @pool.primary_keys['posts']
-      end
-
-      def test_primary_key_for_non_existent_table
-        assert_equal 'id', @pool.primary_keys['omgponies']
-      end
-
-      def test_primary_key_is_set_on_columns
-        posts_columns = @pool.columns_hash['posts']
-        assert posts_columns['id'].primary
-
-        (posts_columns.keys - ['id']).each do |key|
-          assert !posts_columns[key].primary
-        end
-      end
-
-      def test_clear_stale_cached_connections!
-        pool = ConnectionPool.new ActiveRecord::Base.connection_pool.spec
-
-        threads = [
-          Thread.new { pool.connection },
-          Thread.new { pool.connection }]
-
-        threads.map { |t| t.join }
-
-        pool.extend Module.new {
-          attr_accessor :checkins
-          def checkin conn
-            @checkins << conn
-            conn.object_id
-          end
-        }
-        pool.checkins = []
-
-        cleared_threads = pool.clear_stale_cached_connections!
-        assert((cleared_threads - threads.map { |x| x.object_id }).empty?,
-               "threads should have been removed")
-        assert_equal pool.checkins.length, threads.length
-      end
-
       def test_checkout_behaviour
         pool = ConnectionPool.new ActiveRecord::Base.connection_pool.spec
         connection = pool.connection
@@ -107,12 +46,15 @@ module ActiveRecord
             assert thread_ids.include?(t.object_id)
           end
 
-          pool.connection
+          assert_deprecated do
+            pool.connection
+          end
           threads.each do |t|
             thread_ids = pool.instance_variable_get(:@reserved_connections).keys
             assert !thread_ids.include?(t.object_id)
           end
-        end.join()
+          pool.connection.close
+        end.join
 
       end
 
@@ -135,6 +77,10 @@ module ActiveRecord
           pool.with_connection
         end
       end
+
+      def test_pool_sets_connection_visitor
+        assert @pool.connection.visitor.is_a?(Arel::Visitors::ToSql)
+      end
     end
   end
 end