Cleanup after ConnectionPoolTest; also inject a :defer option for calculations

Author: methodmissing

lib/active_record/connection_adapters/mysqlplus_adapter/deferrable/macro.rb

@@ -7,6 +7,7 @@ class << self
         def install!
           ActiveRecord::Base.send :extend, SingletonMethods      
           ar_eigenclass::VALID_FIND_OPTIONS << :defer
+          ActiveRecord::Calculations::CALCULATIONS_OPTIONS << :defer
           alias_deferred :find, :find_by_sql, :preload_associations, :find_every
         end
 

test/connection_pool_test.rb

@@ -4,6 +4,12 @@
 
 class ConnectionPoolTest < ActiveSupport::TestCase
 
+  def teardown
+    ActiveRecord::Base.clear_all_connections!
+    ActiveRecord::Base.establish_connection( Mysqlplus::Test::CONNECTION_SPEC )
+    super
+  end  
+  
   test "should not establish connections in a lazy manner when warmed up" do
     ActiveRecord::Base.connection_pool.expects(:checkout_new_connection).never
     5.times do