diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/databases.rake | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index ddc1f7bc2a..74cb10c8d2 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that db:reset would use migrations instead of loading db/schema.rb [DHH] + * Ensure the plugin loader only loads plugins once. Closes #10102 [haruki_zaemon] * Refactor Plugin Loader. Add plugin lib paths early, and add lots of tests. Closes #9795 [lazyatom] diff --git a/railties/lib/tasks/databases.rake b/railties/lib/tasks/databases.rake index 85cbb42fe3..056415c501 100644 --- a/railties/lib/tasks/databases.rake +++ b/railties/lib/tasks/databases.rake @@ -93,8 +93,8 @@ namespace :db do ActiveRecord::Migrator.migrate('db/migrate/', version) end - desc 'Drops, creates and then migrates the database for the current environment. Target specific version with VERSION=x' - task :reset => ['db:drop', 'db:create', 'db:migrate'] + desc 'Drops and recreates the database from db/schema.rb for the current environment.' + task :reset => ['db:drop', 'db:create', 'db:schema:load'] desc "Retrieves the charset for the current environment's database" task :charset => :environment do |