Skip to content

Commit

Permalink
Revert "Use simple before_app_loads hook instead of bootloader subcla…
Browse files Browse the repository at this point in the history
…ss."

This reverts commit a15f43a.
  • Loading branch information
michaelklishin committed May 11, 2008
1 parent a15f43a commit f67be72
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 9 deletions.
17 changes: 12 additions & 5 deletions 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
15 changes: 11 additions & 4 deletions merb_sequel/lib/merb_sequel.rb
Expand Up @@ -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

0 comments on commit f67be72

Please sign in to comment.