aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2009-12-28 17:37:18 -0800
committerCarl Lerche <carllerche@mac.com>2009-12-28 17:53:05 -0800
commit49c800b6bdf10af4e3f07eee33c4e6d23e7a946d (patch)
tree47104f52097eba76e97ef078d253788b9f3293bf
parentd747b6847ba6e3770986e445f7365efae6077df3 (diff)
downloadrails-49c800b6bdf10af4e3f07eee33c4e6d23e7a946d.tar.gz
rails-49c800b6bdf10af4e3f07eee33c4e6d23e7a946d.tar.bz2
rails-49c800b6bdf10af4e3f07eee33c4e6d23e7a946d.zip
Move the ActiveRecord related rake tasks into the AR gem.
-rw-r--r--activerecord/lib/active_record/rails.rb4
-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.rb1
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