@@ -1,8 +1,9 @@ # make sure we're running inside Merb if defined?(Merb::Plugins) dependency "activerecord" - Merb::BootLoader.before_app_loads do - require File.join(File.dirname(__FILE__) / "merb" / "orms" / "active_record" / "connection") + require File.join(File.dirname(__FILE__) / "merb" / "orms" / "active_record" / "connection") + + Merb::BootLoader.after_app_loads do Merb::Orms::ActiveRecord.connect Merb::Orms::ActiveRecord.register_session_type end merb_activerecord/lib/merb_activerecord.rb @@ -1,10 +1,11 @@ if defined?(Merb::Plugins) - Merb::BootLoader.before_app_loads do - require File.join(File.dirname(__FILE__) / "merb" / "orms" / "data_mapper" / "connection") - require File.join(File.dirname(__FILE__) / "merb" / "orms" / "data_mapper" / "base") + require File.join(File.dirname(__FILE__) / "merb" / "orms" / "data_mapper" / "connection") + require File.join(File.dirname(__FILE__) / "merb" / "orms" / "data_mapper" / "base") + + Merb::BootLoader.after_app_loads do Merb::Orms::DataMapper.connect Merb::Orms::DataMapper.register_session_type end - + Merb::Plugins.add_rakefiles "merb_datamapper" / "merbtasks" end \ No newline at end of file merb_datamapper/lib/merb_datamapper.rb @@ -1,7 +1,8 @@ if defined?(Merb::Plugins) - Merb::BootLoader.before_app_loads do - Merb::Plugins.config[:merb_sequel] = {} - require File.join(File.dirname(__FILE__) / "merb" / "orms" / "sequel" / "connection") + Merb::Plugins.config[:merb_sequel] = {} + require File.join(File.dirname(__FILE__) / "merb" / "orms" / "sequel" / "connection") + + Merb::BootLoader.after_app_loads do Merb::Orms::Sequel.connect Merb::Orms::Sequel.register_session_type end merb_sequel/lib/merb_sequel.rb b4193b785863625e78a239cc202b13480455854c Ben Burkert ben@benburkert.com http://github.com/wycats/merb-plugins/commit/b35f61ca22b21fffb203457f02090c2c475c187c b35f61ca22b21fffb203457f02090c2c475c187c 2008-03-03T12:50:45-08:00 2008-03-03T12:50:45-08:00 Moved database connection code into a after_app_loads block. This should allow rake -T to run without connecting to the database due to the changes to Kernel#dependency. 275db854b9753587945663bcef99a39812adb93d Ben Burkert ben@benburkert.com