aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-11-09 21:58:24 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-11-09 21:58:24 +0000
commit2e12afaefeb0fe3907dd0a8578a620835a1ea452 (patch)
tree19de03885e2aa47a832eaa34a442ee660d148081
parent9d56d12360b85982fae316ad31a925ab73bbdc33 (diff)
downloadrails-2e12afaefeb0fe3907dd0a8578a620835a1ea452.tar.gz
rails-2e12afaefeb0fe3907dd0a8578a620835a1ea452.tar.bz2
rails-2e12afaefeb0fe3907dd0a8578a620835a1ea452.zip
Fixed that db:reset would use migrations instead of loading db/schema.rb [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8123 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/lib/tasks/databases.rake4
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