Skip to content
Browse files

Fix tiny problem: change method order for consistency and fix wrong m…

…ethod name.
  • Loading branch information...
1 parent 17c4158 commit 0074d7d28bc75759a8835b25ab455dd597b46a9b @kennyj committed
View
2 activerecord/lib/active_record/railties/databases.rake
@@ -286,8 +286,8 @@ db_namespace = namespace :db do
# desc "Recreate the databases from the structure.sql file"
task :load => [:environment, :load_config] do
- current_config = ActiveRecord::Tasks::DatabaseTasks.current_config
filename = ENV['DB_STRUCTURE'] || File.join(Rails.root, "db", "structure.sql")
+ current_config = ActiveRecord::Tasks::DatabaseTasks.current_config
ActiveRecord::Tasks::DatabaseTasks.structure_load(current_config, filename)
end
View
2 activerecord/test/cases/tasks/postgresql_rake_test.rb
@@ -225,7 +225,7 @@ def setup
Kernel.stubs(:system)
end
- def test_structure_dump
+ def test_structure_load
filename = "awesome-file.sql"
Kernel.expects(:system).with("psql -f #{filename} my-app-db")

0 comments on commit 0074d7d

Please sign in to comment.
Something went wrong with that request. Please try again.