diff options
-rw-r--r-- | activerecord/lib/active_record/rails.rb | 4 | ||||
-rw-r--r-- | activerecord/lib/active_record/rails/databases.rake (renamed from railties/lib/rails/tasks/databases.rake) | 0 | ||||
-rw-r--r-- | railties/lib/rails/tasks.rb | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/rails.rb b/activerecord/lib/active_record/rails.rb index 8b22f869bc..e7de699974 100644 --- a/activerecord/lib/active_record/rails.rb +++ b/activerecord/lib/active_record/rails.rb @@ -11,6 +11,10 @@ module ActiveRecord config.action_controller.include "ActiveRecord::ControllerRuntime" + rake_tasks do + load "active_record/rails/databases.rake" + end + initializer "active_record.set_configs" do |app| app.config.active_record.each do |k,v| ActiveRecord::Base.send "#{k}=", v diff --git a/railties/lib/rails/tasks/databases.rake b/activerecord/lib/active_record/rails/databases.rake index a35a6c156b..a35a6c156b 100644 --- a/railties/lib/rails/tasks/databases.rake +++ b/activerecord/lib/active_record/rails/databases.rake diff --git a/railties/lib/rails/tasks.rb b/railties/lib/rails/tasks.rb index dc886f4a4d..44c014efe8 100644 --- a/railties/lib/rails/tasks.rb +++ b/railties/lib/rails/tasks.rb @@ -3,7 +3,6 @@ $VERBOSE = nil # Load Rails rakefile extensions %w( annotations - databases documentation framework log |