Update connection pool callbacks for Rails 3

jruby · Oct 16, 2009 · 2ee0d19 · 2ee0d19
1 parent 03feb70
commit 2ee0d19
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/lib/active_record/connection_adapters/jdbc_adapter.rb b/lib/active_record/connection_adapters/jdbc_adapter.rb
@@ -405,8 +405,13 @@ def quote_table_name(name)
 
       module ConnectionPoolCallbacks
         def self.included(base)
-          base.checkin :on_checkin
-          base.checkout :on_checkout
+          if base.respond_to?(:set_callback) # Rails 3 callbacks
+            base.set_callback :checkin, :after, :on_checkin
+            base.set_callback :checkout, :before, :on_checkout
+          else
+            base.checkin :on_checkin
+            base.checkout :on_checkout
+          end
         end
 
         def self.needed?