diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-30 10:47:29 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-30 10:47:29 -0700 |
commit | 3910817bfeae47bdaa4453f6639230eb4d45aaeb (patch) | |
tree | f3060537977f048a37f5cde162c1ee02a62bb463 /activerecord/lib/active_record/railties/databases.rake | |
parent | 0dd969e8b8b7e4f924245fa921f5b468e74a337d (diff) | |
parent | 253ccbc0acd500c25be58d0861d75d381505eb9d (diff) | |
download | rails-3910817bfeae47bdaa4453f6639230eb4d45aaeb.tar.gz rails-3910817bfeae47bdaa4453f6639230eb4d45aaeb.tar.bz2 rails-3910817bfeae47bdaa4453f6639230eb4d45aaeb.zip |
Merge pull request #10386 from kennyj/should_stop_task_when_missing_file
Abort a rake task when missing db/structure.sql like `db:schema:load` task.
Diffstat (limited to 'activerecord/lib/active_record/railties/databases.rake')
-rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index bb9e390c8f..92bef09ff5 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -249,11 +249,8 @@ db_namespace = namespace :db do desc 'Load a schema.rb file into the database' task :load => [:environment, :load_config] do file = ENV['SCHEMA'] || File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir, 'schema.rb') - if File.exists?(file) - load(file) - else - abort %{#{file} doesn't exist yet. Run `rake db:migrate` to create it, then try again. If you do not intend to use a database, you should instead alter #{Rails.root}/config/application.rb to limit the frameworks that will be loaded.} - end + ActiveRecord::Tasks::DatabaseTasks.check_schema_file(file) + load(file) end task :load_if_ruby => ['db:create', :environment] do @@ -298,6 +295,7 @@ db_namespace = namespace :db do # desc "Recreate the databases from the structure.sql file" task :load => [:environment, :load_config] do filename = ENV['DB_STRUCTURE'] || File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir, "structure.sql") + ActiveRecord::Tasks::DatabaseTasks.check_schema_file(filename) current_config = ActiveRecord::Tasks::DatabaseTasks.current_config ActiveRecord::Tasks::DatabaseTasks.structure_load(current_config, filename) end |