From e6a599647f52998d7ebc6492f8ce5ea405f2624f Mon Sep 17 00:00:00 2001 From: Daniel Vartanov Date: Mon, 16 Nov 2015 07:36:46 +0000 Subject: [PATCH] Enable compatibility with ActiveRecord 3+ --- lib/merb_activerecord.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/merb_activerecord.rb b/lib/merb_activerecord.rb index 9df9f51..4588623 100644 --- a/lib/merb_activerecord.rb +++ b/lib/merb_activerecord.rb @@ -1,11 +1,11 @@ -if defined?(Merb::Plugins) - - dependency "activerecord" - +if defined?(Merb::Plugins) + + require "active_record" + 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")) - + class Merb::Orms::ActiveRecord::Connect < Merb::BootLoader after BeforeAppLoads