From 49c800b6bdf10af4e3f07eee33c4e6d23e7a946d Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Mon, 28 Dec 2009 17:37:18 -0800
Subject: [PATCH] Move the ActiveRecord related rake tasks into the AR gem.

---
 activerecord/lib/active_record/rails.rb                       | 4 ++++
 .../lib/active_record/rails}/databases.rake                   | 0
 railties/lib/rails/tasks.rb                                   | 1 -
 3 files changed, 4 insertions(+), 1 deletion(-)
 rename {railties/lib/rails/tasks => activerecord/lib/active_record/rails}/databases.rake (100%)

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
similarity index 100%
rename from railties/lib/rails/tasks/databases.rake
rename to 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