Fix rails#5847 and rails#4045 on master.

kennyj · May 29, 2012 · c0ba0f0 · c0ba0f0
1 parent cc7dd66
commit c0ba0f0
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
@@ -30,6 +30,7 @@ class Railtie < Rails::Railtie
     )
 
     rake_tasks do
+      require "active_record/base"
       load "active_record/railties/databases.rake"
     end
 
@@ -38,6 +39,7 @@ class Railtie < Rails::Railtie
     # first time. Also, make it output to STDERR.
     console do |app|
       require "active_record/railties/console_sandbox" if app.sandbox?
+      require "active_record/base"
       console = ActiveSupport::Logger.new(STDERR)
       Rails.logger.extend ActiveSupport::Logger.broadcast console
     end