aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-04 16:31:06 +0200
committerJosé Valim <jose.valim@gmail.com>2011-05-04 16:32:24 +0200
commitb9bba555caa95389e97bd7d32472ddc1e429d7c2 (patch)
tree2f3dd4d0c803842d8dca4708024395953944ce31 /activerecord
parentcea3b3cc9d645592945289c116a6e7c7ff9ec489 (diff)
downloadrails-b9bba555caa95389e97bd7d32472ddc1e429d7c2.tar.gz
rails-b9bba555caa95389e97bd7d32472ddc1e429d7c2.tar.bz2
rails-b9bba555caa95389e97bd7d32472ddc1e429d7c2.zip
Remove defined?(ActiveRecord) and use the railtie hook instead.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/railtie.rb7
1 files changed, 4 insertions, 3 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