diff options
author | José Valim <jose.valim@gmail.com> | 2010-01-18 18:22:55 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-01-18 18:22:55 +0100 |
commit | 728db5a932a1a185e6c366f1671e0b1f81d7b027 (patch) | |
tree | 0252399e01035c52004b994373e1b4449240dba3 | |
parent | 68b76a38eb83db8515336ec2e7fd8191798386be (diff) | |
download | rails-728db5a932a1a185e6c366f1671e0b1f81d7b027.tar.gz rails-728db5a932a1a185e6c366f1671e0b1f81d7b027.tar.bz2 rails-728db5a932a1a185e6c366f1671e0b1f81d7b027.zip |
Rake tasks should load generators from new paths.
-rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 2 | ||||
-rw-r--r-- | railties/lib/rails/tasks/framework.rake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index b39e064e45..88974dd786 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -428,7 +428,7 @@ namespace :db do task :create => :environment do raise "Task unavailable to this database (no migration support)" unless ActiveRecord::Base.connection.supports_migrations? require 'rails/generators' - require 'rails/generators/rails/session_migration/session_migration_generator' + require 'generators/rails/session_migration/session_migration_generator' Rails::Generators::SessionMigrationGenerator.start [ ENV["MIGRATION"] || "add_sessions_table" ] end diff --git a/railties/lib/rails/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake index 93ba309039..5d7c094d8b 100644 --- a/railties/lib/rails/tasks/framework.rake +++ b/railties/lib/rails/tasks/framework.rake @@ -86,7 +86,7 @@ namespace :rails do template = File.expand_path(template) if template !~ %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} require 'rails/generators' - require 'rails/generators/rails/app/app_generator' + require 'generators/rails/app/app_generator' generator = Rails::Generators::AppGenerator.new [ Rails.root ], {}, :destination_root => Rails.root generator.apply template, :verbose => false end @@ -94,7 +94,7 @@ namespace :rails do namespace :update do def invoke_from_app_generator(method) require 'rails/generators' - require 'rails/generators/rails/app/app_generator' + require 'generators/rails/app/app_generator' generator = Rails::Generators::AppGenerator.new ["rails"], { :with_dispatchers => true }, :destination_root => Rails.root |