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.

16 files changed, 46 insertions, 245 deletions

diff --git a/activerecord/test/cases/adapter_test.rb b/activerecord/test/cases/adapter_test.rb
index 93b01a3934..404b492288 100644
--- a/activerecord/test/cases/adapter_test.rb
+++ b/activerecord/test/cases/adapter_test.rb
@@ -69,16 +69,16 @@ module ActiveRecord
       def test_not_specifying_database_name_for_cross_database_selects
         begin
           assert_nothing_raised do
-            ActiveRecord::Model.establish_connection(ActiveRecord::Base.configurations['arunit'].except(:database))
+            ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['arunit'].except(:database))
 
             config = ARTest.connection_config
-            ActiveRecord::Model.connection.execute(
+            ActiveRecord::Base.connection.execute(
               "SELECT #{config['arunit']['database']}.pirates.*, #{config['arunit2']['database']}.courses.* " \
               "FROM #{config['arunit']['database']}.pirates, #{config['arunit2']['database']}.courses"
             )
           end
         ensure
-          ActiveRecord::Model.establish_connection 'arunit'
+          ActiveRecord::Base.establish_connection 'arunit'
         end
       end
     end
diff --git a/activerecord/test/cases/adapters/mysql/connection_test.rb b/activerecord/test/cases/adapters/mysql/connection_test.rb
index 4bccd2cc59..534dc2c2df 100644
--- a/activerecord/test/cases/adapters/mysql/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql/connection_test.rb
@@ -3,13 +3,13 @@ require "cases/helper"
 class MysqlConnectionTest < ActiveRecord::TestCase
   def setup
     super
-    @connection = ActiveRecord::Model.connection
+    @connection = ActiveRecord::Base.connection
   end
 
   def test_mysql_reconnect_attribute_after_connection_with_reconnect_true
     run_without_connection do |orig_connection|
-      ActiveRecord::Model.establish_connection(orig_connection.merge({:reconnect => true}))
-      assert ActiveRecord::Model.connection.raw_connection.reconnect
+      ActiveRecord::Base.establish_connection(orig_connection.merge({:reconnect => true}))
+      assert ActiveRecord::Base.connection.raw_connection.reconnect
     end
   end
 
@@ -25,8 +25,8 @@ class MysqlConnectionTest < ActiveRecord::TestCase
 
   def test_mysql_reconnect_attribute_after_connection_with_reconnect_false
     run_without_connection do |orig_connection|
-      ActiveRecord::Model.establish_connection(orig_connection.merge({:reconnect => false}))
-      assert !ActiveRecord::Model.connection.raw_connection.reconnect
+      ActiveRecord::Base.establish_connection(orig_connection.merge({:reconnect => false}))
+      assert !ActiveRecord::Base.connection.raw_connection.reconnect
     end
   end
 
@@ -117,7 +117,7 @@ class MysqlConnectionTest < ActiveRecord::TestCase
   # Test that MySQL allows multiple results for stored procedures
   if defined?(Mysql) && Mysql.const_defined?(:CLIENT_MULTI_RESULTS)
     def test_multi_results
-      rows = ActiveRecord::Model.connection.select_rows('CALL ten();')
+      rows = ActiveRecord::Base.connection.select_rows('CALL ten();')
       assert_equal 10, rows[0][0].to_i, "ten() did not return 10 as expected: #{rows.inspect}"
       assert @connection.active?, "Bad connection use by 'MysqlAdapter.select_rows'"
     end
@@ -130,9 +130,9 @@ class MysqlConnectionTest < ActiveRecord::TestCase
 
   def test_mysql_strict_mode_disabled_dont_override_global_sql_mode
     run_without_connection do |orig_connection|
-      ActiveRecord::Model.establish_connection(orig_connection.merge({:strict => false}))
-      global_sql_mode = ActiveRecord::Model.connection.exec_query "SELECT @@GLOBAL.sql_mode"
-      session_sql_mode = ActiveRecord::Model.connection.exec_query "SELECT @@SESSION.sql_mode"
+      ActiveRecord::Base.establish_connection(orig_connection.merge({:strict => false}))
+      global_sql_mode = ActiveRecord::Base.connection.exec_query "SELECT @@GLOBAL.sql_mode"
+      session_sql_mode = ActiveRecord::Base.connection.exec_query "SELECT @@SESSION.sql_mode"
       assert_equal global_sql_mode.rows, session_sql_mode.rows
     end
   end
@@ -140,11 +140,11 @@ class MysqlConnectionTest < ActiveRecord::TestCase
   private
 
   def run_without_connection
-    original_connection = ActiveRecord::Model.remove_connection
+    original_connection = ActiveRecord::Base.remove_connection
     begin
       yield original_connection
     ensure
-      ActiveRecord::Model.establish_connection(original_connection)
+      ActiveRecord::Base.establish_connection(original_connection)
     end
   end
 end
diff --git a/activerecord/test/cases/adapters/mysql2/connection_test.rb b/activerecord/test/cases/adapters/mysql2/connection_test.rb
index c63e4fe5b6..14c22d2519 100644
--- a/activerecord/test/cases/adapters/mysql2/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/connection_test.rb
@@ -3,7 +3,7 @@ require "cases/helper"
 class MysqlConnectionTest < ActiveRecord::TestCase
   def setup
     super
-    @connection = ActiveRecord::Model.connection
+    @connection = ActiveRecord::Base.connection
     @connection.extend(LogIntercepter)
     @connection.intercepted = true
   end
@@ -46,9 +46,9 @@ class MysqlConnectionTest < ActiveRecord::TestCase
 
   def test_mysql_strict_mode_disabled_dont_override_global_sql_mode
     run_without_connection do |orig_connection|
-      ActiveRecord::Model.establish_connection(orig_connection.merge({:strict => false}))
-      global_sql_mode = ActiveRecord::Model.connection.exec_query "SELECT @@GLOBAL.sql_mode"
-      session_sql_mode = ActiveRecord::Model.connection.exec_query "SELECT @@SESSION.sql_mode"
+      ActiveRecord::Base.establish_connection(orig_connection.merge({:strict => false}))
+      global_sql_mode = ActiveRecord::Base.connection.exec_query "SELECT @@GLOBAL.sql_mode"
+      session_sql_mode = ActiveRecord::Base.connection.exec_query "SELECT @@SESSION.sql_mode"
       assert_equal global_sql_mode.rows, session_sql_mode.rows
     end
   end
@@ -76,11 +76,11 @@ class MysqlConnectionTest < ActiveRecord::TestCase
   private
 
   def run_without_connection
-    original_connection = ActiveRecord::Model.remove_connection
+    original_connection = ActiveRecord::Base.remove_connection
     begin
       yield original_connection
     ensure
-      ActiveRecord::Model.establish_connection(original_connection)
+      ActiveRecord::Base.establish_connection(original_connection)
     end
   end
 end
diff --git a/activerecord/test/cases/attribute_methods/read_test.rb b/activerecord/test/cases/attribute_methods/read_test.rb
index da5d9d8c2a..8d8ff2f952 100644
--- a/activerecord/test/cases/attribute_methods/read_test.rb
+++ b/activerecord/test/cases/attribute_methods/read_test.rb
@@ -11,10 +11,8 @@ module ActiveRecord
       def setup
         @klass = Class.new do
           def self.superclass; Base; end
-          def self.active_record_super; Base; end
           def self.base_class; self; end
 
-          extend ActiveRecord::Configuration
           include ActiveRecord::AttributeMethods
 
           def self.define_attribute_methods
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 0f859bf452..203e44857a 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -23,7 +23,6 @@ require 'models/edge'
 require 'models/joke'
 require 'models/bulb'
 require 'models/bird'
-require 'models/teapot'
 require 'rexml/document'
 require 'active_support/core_ext/exception'
 
@@ -1196,10 +1195,6 @@ class BasicsTest < ActiveRecord::TestCase
 
     # Concrete subclasses an abstract class which has a type column.
     assert !SubStiPost.descends_from_active_record?
-
-    assert Teapot.descends_from_active_record?
-    assert !OtherTeapot.descends_from_active_record?
-    assert CoolTeapot.descends_from_active_record?
   end
 
   def test_find_on_abstract_base_class_doesnt_use_type_condition
@@ -1453,15 +1448,6 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal scope, Bird.uniq
   end
 
-  def test_active_record_super
-    assert_equal ActiveRecord::Model, ActiveRecord::Base.active_record_super
-    assert_equal ActiveRecord::Base,  Topic.active_record_super
-    assert_equal Topic,               ImportantTopic.active_record_super
-    assert_equal ActiveRecord::Model, Teapot.active_record_super
-    assert_equal Teapot,              OtherTeapot.active_record_super
-    assert_equal ActiveRecord::Model, CoolTeapot.active_record_super
-  end
-
   def test_table_name_with_2_abstract_subclasses
     assert_equal "photos", Photo.table_name
   end
diff --git a/activerecord/test/cases/connection_adapters/connection_handler_test.rb b/activerecord/test/cases/connection_adapters/connection_handler_test.rb
index 4467ddfc39..631bf1aaac 100644
--- a/activerecord/test/cases/connection_adapters/connection_handler_test.rb
+++ b/activerecord/test/cases/connection_adapters/connection_handler_test.rb
@@ -4,8 +4,8 @@ module ActiveRecord
   module ConnectionAdapters
     class ConnectionHandlerTest < ActiveRecord::TestCase
       def setup
-        @klass    = Class.new { include ActiveRecord::Tag }
-        @subklass = Class.new(@klass) { include ActiveRecord::Tag }
+        @klass    = Class.new(Base)
+        @subklass = Class.new(@klass)
 
         @handler = ConnectionHandler.new
         @handler.establish_connection @klass, Base.connection_pool.spec
diff --git a/activerecord/test/cases/defaults_test.rb b/activerecord/test/cases/defaults_test.rb
index 0df872ff10..ed7eedaa27 100644
--- a/activerecord/test/cases/defaults_test.rb
+++ b/activerecord/test/cases/defaults_test.rb
@@ -52,12 +52,12 @@ if current_adapter?(:MysqlAdapter) or current_adapter?(:Mysql2Adapter)
     self.use_transactional_fixtures = false
 
     def using_strict(strict)
-      connection = ActiveRecord::Model.remove_connection
-      ActiveRecord::Model.establish_connection connection.merge(strict: strict)
+      connection = ActiveRecord::Base.remove_connection
+      ActiveRecord::Base.establish_connection connection.merge(strict: strict)
       yield
     ensure
-      ActiveRecord::Model.remove_connection
-      ActiveRecord::Model.establish_connection connection
+      ActiveRecord::Base.remove_connection
+      ActiveRecord::Base.establish_connection connection
     end
 
     # MySQL cannot have defaults on text/blob columns. It reports the
diff --git a/activerecord/test/cases/inclusion_test.rb b/activerecord/test/cases/inclusion_test.rb
deleted file mode 100644
index 8f095e4953..0000000000
--- a/activerecord/test/cases/inclusion_test.rb
+++ /dev/null
@@ -1,133 +0,0 @@
-require 'cases/helper'
-require 'models/teapot'
-
-class BasicInclusionModelTest < ActiveRecord::TestCase
-  def test_basic_model
-    Teapot.create!(:name => "Ronnie Kemper")
-    assert_equal "Ronnie Kemper", Teapot.first.name
-  end
-
-  def test_initialization
-    t = Teapot.new(:name => "Bob")
-    assert_equal "Bob", t.name
-  end
-
-  def test_inherited_model
-    teapot = CoolTeapot.create!(:name => "Bob")
-    teapot.reload
-
-    assert_equal "Bob", teapot.name
-    assert_equal "mmm", teapot.aaahhh
-  end
-
-  def test_generated_feature_methods
-    assert Teapot < Teapot::GeneratedFeatureMethods
-  end
-
-  def test_exists
-    t = Teapot.create!(:name => "Ronnie Kemper")
-    assert Teapot.exists?(t)
-  end
-
-  def test_predicate_builder
-    t = Teapot.create!(:name => "Bob")
-    assert_equal "Bob", Teapot.where(:id => [t]).first.name
-    assert_equal "Bob", Teapot.where(:id => t).first.name
-  end
-
-  def test_nested_model
-    assert_equal "ceiling_teapots", Ceiling::Teapot.table_name
-  end
-end
-
-class InclusionUnitTest < ActiveRecord::TestCase
-  def setup
-    @klass = Class.new { include ActiveRecord::Model }
-  end
-
-  def test_non_abstract_class
-    assert !@klass.abstract_class?
-  end
-
-  def test_abstract_class
-    @klass.abstract_class = true
-    assert @klass.abstract_class?
-  end
-
-  def test_establish_connection
-    assert @klass.respond_to?(:establish_connection)
-    assert ActiveRecord::Model.respond_to?(:establish_connection)
-  end
-
-  def test_adapter_connection
-    name = "#{ActiveRecord::Base.connection_config[:adapter]}_connection"
-    assert @klass.respond_to?(name)
-    assert ActiveRecord::Model.respond_to?(name)
-  end
-
-  def test_connection_handler
-    assert_equal ActiveRecord::Base.connection_handler, @klass.connection_handler
-  end
-
-  def test_mirrored_configuration
-    ActiveRecord::Base.time_zone_aware_attributes = true
-    assert @klass.time_zone_aware_attributes
-    ActiveRecord::Base.time_zone_aware_attributes = false
-    assert !@klass.time_zone_aware_attributes
-  ensure
-    ActiveRecord::Base.time_zone_aware_attributes = false
-  end
-
-  # Doesn't really test anything, but this is here to ensure warnings don't occur
-  def test_included_twice
-    @klass.send :include, ActiveRecord::Model
-  end
-
-  def test_deprecation_proxy
-    proxy = ActiveRecord::Model::DeprecationProxy.new
-
-    assert_equal ActiveRecord::Model.name, proxy.name
-    assert_equal ActiveRecord::Base.superclass, assert_deprecated { proxy.superclass }
-
-    sup, sup2 = nil, nil
-    ActiveSupport.on_load(:__test_active_record_model_deprecation) do
-      sup = superclass
-      sup2 = send(:superclass)
-    end
-    assert_deprecated do
-      ActiveSupport.run_load_hooks(:__test_active_record_model_deprecation, proxy)
-    end
-    assert_equal ActiveRecord::Base.superclass, sup
-    assert_equal ActiveRecord::Base.superclass, sup2
-  end
-
-  test "including in deprecation proxy" do
-    model, base = ActiveRecord::Model.dup, ActiveRecord::Base.dup
-    proxy = ActiveRecord::Model::DeprecationProxy.new(model, base)
-
-    mod = Module.new
-    proxy.include mod
-    assert model < mod
-  end
-
-  test "extending in deprecation proxy" do
-    model, base = ActiveRecord::Model.dup, ActiveRecord::Base.dup
-    proxy = ActiveRecord::Model::DeprecationProxy.new(model, base)
-
-    mod = Module.new
-    assert_deprecated { proxy.extend mod }
-    assert base.singleton_class < mod
-  end
-end
-
-class InclusionFixturesTest < ActiveRecord::TestCase
-  fixtures :teapots
-
-  def test_fixtured_record
-    assert_equal "Bob", teapots(:bob).name
-  end
-
-  def test_timestamped_fixture
-    assert_not_nil teapots(:bob).created_at
-  end
-end
diff --git a/activerecord/test/cases/inheritance_test.rb b/activerecord/test/cases/inheritance_test.rb
index 8fded9159f..aab7aa51dd 100644
--- a/activerecord/test/cases/inheritance_test.rb
+++ b/activerecord/test/cases/inheritance_test.rb
@@ -4,7 +4,6 @@ require 'models/person'
 require 'models/post'
 require 'models/project'
 require 'models/subscriber'
-require 'models/teapot'
 require 'models/vegetables'
 
 class InheritanceTest < ActiveRecord::TestCase
@@ -81,10 +80,6 @@ class InheritanceTest < ActiveRecord::TestCase
     assert_equal SubStiPost, SubStiPost.base_class
   end
 
-  def test_active_record_model_included_base_class
-    assert_equal Teapot, Teapot.base_class
-  end
-
   def test_abstract_inheritance_base_class
     assert_equal LoosePerson, LoosePerson.base_class
     assert_equal LooseDescendant, LooseDescendant.base_class
@@ -93,11 +88,7 @@ class InheritanceTest < ActiveRecord::TestCase
   end
 
   def test_base_class_activerecord_error
-    klass = Class.new {
-      extend ActiveRecord::Configuration
-      include ActiveRecord::Inheritance
-    }
-
+    klass = Class.new { include ActiveRecord::Inheritance }
     assert_raise(ActiveRecord::ActiveRecordError) { klass.base_class }
   end
 
diff --git a/activerecord/test/cases/multiple_db_test.rb b/activerecord/test/cases/multiple_db_test.rb
index 42461e8ecb..2e386a172a 100644
--- a/activerecord/test/cases/multiple_db_test.rb
+++ b/activerecord/test/cases/multiple_db_test.rb
@@ -96,12 +96,12 @@ class MultipleDbTest < ActiveRecord::TestCase
   unless in_memory_db?
     def test_associations_should_work_when_model_has_no_connection
       begin
-        ActiveRecord::Model.remove_connection
+        ActiveRecord::Base.remove_connection
         assert_nothing_raised ActiveRecord::ConnectionNotEstablished do
           College.first.courses.first
         end
       ensure
-        ActiveRecord::Model.establish_connection 'arunit'
+        ActiveRecord::Base.establish_connection 'arunit'
       end
     end
   end
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?
diff --git a/activerecord/test/cases/primary_keys_test.rb b/activerecord/test/cases/primary_keys_test.rb
index e6e50a4cd4..bf8aacc363 100644
--- a/activerecord/test/cases/primary_keys_test.rb
+++ b/activerecord/test/cases/primary_keys_test.rb
@@ -188,14 +188,14 @@ class PrimaryKeyWithNoConnectionTest < ActiveRecord::TestCase
   def test_set_primary_key_with_no_connection
     return skip("disconnect wipes in-memory db") if in_memory_db?
 
-    connection = ActiveRecord::Model.remove_connection
+    connection = ActiveRecord::Base.remove_connection
 
     model = Class.new(ActiveRecord::Base)
     model.primary_key = 'foo'
 
     assert_equal 'foo', model.primary_key
 
-    ActiveRecord::Model.establish_connection(connection)
+    ActiveRecord::Base.establish_connection(connection)
 
     assert_equal 'foo', model.primary_key
   end
diff --git a/activerecord/test/cases/unconnected_test.rb b/activerecord/test/cases/unconnected_test.rb
index 5a69054445..e82ca3f93d 100644
--- a/activerecord/test/cases/unconnected_test.rb
+++ b/activerecord/test/cases/unconnected_test.rb
@@ -7,13 +7,13 @@ class TestUnconnectedAdapter < ActiveRecord::TestCase
   self.use_transactional_fixtures = false
 
   def setup
-    @underlying = ActiveRecord::Model.connection
-    @specification = ActiveRecord::Model.remove_connection
+    @underlying = ActiveRecord::Base.connection
+    @specification = ActiveRecord::Base.remove_connection
   end
 
   def teardown
     @underlying = nil
-    ActiveRecord::Model.establish_connection(@specification)
+    ActiveRecord::Base.establish_connection(@specification)
     load_schema if in_memory_db?
   end
 
diff --git a/activerecord/test/models/teapot.rb b/activerecord/test/models/teapot.rb
deleted file mode 100644
index b035b18c1b..0000000000
--- a/activerecord/test/models/teapot.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-class Teapot
-  # I'm a little teapot,
-  # Short and stout,
-  # Here is my handle
-  # Here is my spout
-  # When I get all steamed up,
-  # Hear me shout,
-  # Tip me over and pour me out!
-  #
-  # HELL YEAH TEAPOT SONG
-
-  include ActiveRecord::Model
-end
-
-class OtherTeapot < Teapot
-end
-
-class OMFGIMATEAPOT
-  def aaahhh
-    "mmm"
-  end
-end
-
-class CoolTeapot < OMFGIMATEAPOT
-  include ActiveRecord::Model
-  self.table_name = "teapots"
-end
-
-class Ceiling
-  include ActiveRecord::Model
-
-  class Teapot
-    include ActiveRecord::Model
-  end
-end
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index 2e4ec96933..eec06754a5 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -648,12 +648,6 @@ ActiveRecord::Schema.define do
     t.datetime :ending
   end
 
-  create_table :teapots, :force => true do |t|
-    t.string :name
-    t.string :type
-    t.timestamps
-  end
-
   create_table :topics, :force => true do |t|
     t.string   :title
     t.string   :author_name
diff --git a/activerecord/test/support/connection.rb b/activerecord/test/support/connection.rb
index bea894a583..196b3a9493 100644
--- a/activerecord/test/support/connection.rb
+++ b/activerecord/test/support/connection.rb
@@ -13,9 +13,9 @@ module ARTest
 
   def self.connect
     puts "Using #{connection_name}"
-    ActiveRecord::Model.logger = ActiveSupport::Logger.new("debug.log", 0, 100 * 1024 * 1024)
-    ActiveRecord::Model.configurations = connection_config
-    ActiveRecord::Model.establish_connection 'arunit'
+    ActiveRecord::Base.logger = ActiveSupport::Logger.new("debug.log", 0, 100 * 1024 * 1024)
+    ActiveRecord::Base.configurations = connection_config
+    ActiveRecord::Base.establish_connection 'arunit'
     ARUnit2Model.establish_connection 'arunit2'
   end
 end