From fdcd81970e1db2343de7d722e3c5548c6c1f27cd Mon Sep 17 00:00:00 2001 From: Emilio Tagua Date: Thu, 23 Apr 2009 13:54:00 -0300 Subject: Require Arel --- activerecord/lib/active_record.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index 500a90d6cb..f5a7829a73 100644 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -21,6 +21,8 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ + + begin require 'active_support' rescue LoadError @@ -32,6 +34,9 @@ rescue LoadError end require 'active_support/core/all' +$:.unshift(File.dirname(__FILE__) + '/../../arel/lib') +require 'arel' + module ActiveRecord # TODO: Review explicit loads to see if they will automatically be handled by the initilizer. def self.load_all! -- cgit v1.2.3