diff options
| author | kennyj <kennyj@gmail.com> | 2012-05-29 00:47:10 +0900 |
|---|---|---|
| committer | kennyj <kennyj@gmail.com> | 2012-05-30 00:27:43 +0900 |
| commit | c0ba0f01d05844bf3024d3926900706b270adf4d (patch) | |
| tree | 8333b39bc6618a209c462a53c7286f8a5bcf0da5 | |
| parent | cc7dd66c68cb948424f3b64492b0ceeb3e55f66f (diff) | |
| download | rails-c0ba0f01d05844bf3024d3926900706b270adf4d.tar.gz rails-c0ba0f01d05844bf3024d3926900706b270adf4d.tar.bz2 rails-c0ba0f01d05844bf3024d3926900706b270adf4d.zip | |
Fix #5847 and #4045 on master.
| -rw-r--r-- | activerecord/lib/active_record/railtie.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index 3091197bc2..1e497b2a79 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -30,6 +30,7 @@ module ActiveRecord ) rake_tasks do + require "active_record/base" load "active_record/railties/databases.rake" end @@ -38,6 +39,7 @@ module ActiveRecord # 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 |