diff options
author | José Valim <jose.valim@gmail.com> | 2012-05-29 08:48:00 -0700 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2012-05-29 08:48:00 -0700 |
commit | 9fa3926e4fd1c3c24a9ecc613b98cde6609f2975 (patch) | |
tree | 8333b39bc6618a209c462a53c7286f8a5bcf0da5 /activerecord/lib/active_record/railtie.rb | |
parent | d46a36805b93478f39039f4cab006f0aabd4cfd0 (diff) | |
parent | c0ba0f01d05844bf3024d3926900706b270adf4d (diff) | |
download | rails-9fa3926e4fd1c3c24a9ecc613b98cde6609f2975.tar.gz rails-9fa3926e4fd1c3c24a9ecc613b98cde6609f2975.tar.bz2 rails-9fa3926e4fd1c3c24a9ecc613b98cde6609f2975.zip |
Merge pull request #6518 from kennyj/fix_5847-4
(Try again) Fix #5847 and #4045.
Diffstat (limited to 'activerecord/lib/active_record/railtie.rb')
-rw-r--r-- | activerecord/lib/active_record/railtie.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index eb2769f1ef..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,10 +39,15 @@ 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 + runner do |app| + require "active_record/base" + end + initializer "active_record.initialize_timezone" do ActiveSupport.on_load(:active_record) do self.time_zone_aware_attributes = true |