Remove ActiveRecord::Model

In the end I think the pain of implementing this seamlessly was not
worth the gain provided.

The intention was that it would allow plain ruby objects that might not
live in your main application to be subclassed and have persistence
mixed in. But I've decided that the benefit of doing that is not worth
the amount of complexity that the implementation introduced.

1 files changed, 9 insertions, 9 deletions

diff --git a/activerecord/test/cases/pooled_connections_test.rb b/activerecord/test/cases/pooled_connections_test.rb
index 0a6354f5cc..a8a9b06ec4 100644
--- a/activerecord/test/cases/pooled_connections_test.rb
+++ b/activerecord/test/cases/pooled_connections_test.rb
@@ -7,17 +7,17 @@ class PooledConnectionsTest < ActiveRecord::TestCase
 
   def setup
     @per_test_teardown = []
-    @connection = ActiveRecord::Model.remove_connection
+    @connection = ActiveRecord::Base.remove_connection
   end
 
   def teardown
-    ActiveRecord::Model.clear_all_connections!
-    ActiveRecord::Model.establish_connection(@connection)
+    ActiveRecord::Base.clear_all_connections!
+    ActiveRecord::Base.establish_connection(@connection)
     @per_test_teardown.each {|td| td.call }
   end
 
   def checkout_connections
-    ActiveRecord::Model.establish_connection(@connection.merge({:pool => 2, :checkout_timeout => 0.3}))
+    ActiveRecord::Base.establish_connection(@connection.merge({:pool => 2, :checkout_timeout => 0.3}))
     @connections = []
     @timed_out = 0
 
@@ -34,15 +34,15 @@ class PooledConnectionsTest < ActiveRecord::TestCase
 
   # Will deadlock due to lack of Monitor timeouts in 1.9
   def checkout_checkin_connections(pool_size, threads)
-    ActiveRecord::Model.establish_connection(@connection.merge({:pool => pool_size, :checkout_timeout => 0.5}))
+    ActiveRecord::Base.establish_connection(@connection.merge({:pool => pool_size, :checkout_timeout => 0.5}))
     @connection_count = 0
     @timed_out = 0
     threads.times do
       Thread.new do
         begin
-          conn = ActiveRecord::Model.connection_pool.checkout
+          conn = ActiveRecord::Base.connection_pool.checkout
           sleep 0.1
-          ActiveRecord::Model.connection_pool.checkin conn
+          ActiveRecord::Base.connection_pool.checkin conn
           @connection_count += 1
         rescue ActiveRecord::ConnectionTimeoutError
           @timed_out += 1
@@ -55,13 +55,13 @@ class PooledConnectionsTest < ActiveRecord::TestCase
     checkout_checkin_connections 1, 2
     assert_equal 2, @connection_count
     assert_equal 0, @timed_out
-    assert_equal 1, ActiveRecord::Model.connection_pool.connections.size
+    assert_equal 1, ActiveRecord::Base.connection_pool.connections.size
   end
 
 
   private
 
   def add_record(name)
-    ActiveRecord::Model.connection_pool.with_connection { Project.create! :name => name }
+    ActiveRecord::Base.connection_pool.with_connection { Project.create! :name => name }
   end
 end unless current_adapter?(:FrontBase) || in_memory_db?