diff options
| -rw-r--r-- | activerecord/lib/active_record/railtie.rb | 7 | ||||
| -rw-r--r-- | railties/lib/rails/commands/console.rb | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index d38588519b..276f674cc3 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -26,10 +26,11 @@ 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. + # When loading console, force ActiveRecord::Base to be loaded + # to avoid cross references when loading a constant for the + # first time. Also, make it output to STDERR. console do - ActiveRecord::Base + ActiveRecord::Base.logger = Logger.new(STDERR) end initializer "active_record.initialize_timezone" do diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb index dfd3c654ff..66dbb5d11e 100644 --- a/railties/lib/rails/commands/console.rb +++ b/railties/lib/rails/commands/console.rb @@ -34,10 +34,6 @@ module Rails exit end end - - if defined?(ActiveRecord) - ActiveRecord::Base.logger = Logger.new(STDERR) - end if options[:sandbox] puts "Loading #{Rails.env} environment in sandbox (Rails #{Rails.version})" |