DEPRECATION WARNING: ActiveRecord::Base.verification_timeout= has bee…

…n deprecated and no longer has any effect.

Please remove all references to verification_timeout=..

Cleanup connection to ActiveRecord's connection pool after dispatch.

Signed-off-by: Jack Dempsey <jack.dempsey@gmail.com>

merb_activerecord/lib/merb/orms/active_record/cleanup.rb

@@ -0,0 +1,6 @@
+# This is the default behavior for ActiveRecord when used
+# in conjunction with ActionPack's request handling cycle.
+# TODO write test
+Merb::Controller.after do
+  ActiveRecord::Base.clear_active_connections!
+end

merb_activerecord/lib/merb/orms/active_record/connection.rb

@@ -60,7 +60,6 @@ def connect
 
             Thread.new{ loop{ sleep(60*60); ::ActiveRecord::Base.verify_active_connections! } }
 
-            ::ActiveRecord::Base.verification_timeout = 14400
             ::ActiveRecord::Base.logger = Merb.logger
             ::ActiveRecord::Base.configurations = configurations
             ::ActiveRecord::Base.establish_connection config

merb_activerecord/lib/merb_activerecord.rb

@@ -2,6 +2,7 @@
 
   dependency "activerecord"
 
+  require File.join(File.dirname(__FILE__) / "merb" / "orms" / "active_record" / "cleanup" )
   require File.join(File.dirname(__FILE__) / "merb" / "orms" / "active_record" / "connection")
   Merb::Plugins.add_rakefiles(File.join(File.dirname(__FILE__) / "active_record" / "merbtasks"))