From fa98eca75bd8666719bf3d061c87638850a20fe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 17 Jul 2010 10:59:41 +0200
Subject: Add console hook to force ActiveRecord::Base to be loaded when
 console starts avoiding reference loops.

---
 activerecord/lib/active_record/railtie.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'activerecord')

diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index eff51a7c87..78fdb77216 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -22,6 +22,12 @@ module ActiveRecord
       load "active_record/railties/databases.rake"
     end
 
+    # When loading console, force ActiveRecord to be loaded to avoid cross
+    # references when loading a constant for the first time.
+    console do
+      ActiveRecord::Base
+    end
+
     initializer "active_record.initialize_timezone" do
       ActiveSupport.on_load(:active_record) do
         self.time_zone_aware_attributes = true
-- 
cgit v1.2.3