diff --git a/merb_activerecord/lib/merb_activerecord.rb b/merb_activerecord/lib/merb_activerecord.rb index 97bbf8b..11c1d98 100644 --- a/merb_activerecord/lib/merb_activerecord.rb +++ b/merb_activerecord/lib/merb_activerecord.rb @@ -1,10 +1,17 @@ -if defined?(Merb::Plugins) +if defined?(Merb::Plugins) dependency "activerecord" require File.join(File.dirname(__FILE__) / "merb" / "orms" / "active_record" / "connection") Merb::Plugins.add_rakefiles(File.join(File.dirname(__FILE__) / "active_record" / "merbtasks")) + + class Merb::Orms::ActiveRecord::Connect < Merb::BootLoader + + after BeforeAppLoads + + def self.run + Merb::Orms::ActiveRecord.connect + Merb::Orms::ActiveRecord.register_session_type + end - Merb::BootLoader.before_app_loads do - Merb::Orms::ActiveRecord.connect - Merb::Orms::ActiveRecord.register_session_type end -end + +end \ No newline at end of file diff --git a/merb_sequel/lib/merb_sequel.rb b/merb_sequel/lib/merb_sequel.rb index f3635e4..366a3aa 100644 --- a/merb_sequel/lib/merb_sequel.rb +++ b/merb_sequel/lib/merb_sequel.rb @@ -2,9 +2,16 @@ Merb::Plugins.config[:merb_sequel] = {} require File.join(File.dirname(__FILE__) / "merb" / "orms" / "sequel" / "connection") Merb::Plugins.add_rakefiles "merb_sequel" / "merbtasks" + + class Merb::Orms::Sequel::Connect < Merb::BootLoader + + after BeforeAppLoads + + def self.run + Merb::Orms::Sequel.connect + Merb::Orms::Sequel.register_session_type + end - Merb::BootLoader.before_app_loads do - Merb::Orms::Sequel.connect - Merb::Orms::Sequel.register_session_type end -end + +end \ No newline at end of file