From 1db8f9d5fdce7bead9bfa210163c0df09f864dd2 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 30 Apr 2013 17:27:23 -0700 Subject: [PATCH] Merge pull request #10349 from caliper-io/mute_psql_output Fix noisy output when running rake db:schema:load on postgreSQL and structure.sql Conflicts: activerecord/CHANGELOG.md --- activerecord/CHANGELOG.md | 4 ++++ .../lib/active_record/tasks/postgresql_database_tasks.rb | 2 +- activerecord/test/cases/tasks/postgresql_rake_test.rb | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index b2a7568178..a6fdd73bd7 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,7 @@ +* Mute `psql` output when running rake db:schema:load. + + *Godfrey Chan* + ## Rails 4.0.0.rc1 (April 29, 2013) ## * Trigger a save on `has_one association=(associate)` when the associate contents have changed. diff --git a/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb b/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb index 0b1b030516..4413330fab 100644 --- a/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb +++ b/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb @@ -59,7 +59,7 @@ def structure_dump(filename) def structure_load(filename) set_psql_env - Kernel.system("psql -f #{filename} #{configuration['database']}") + Kernel.system("psql -q -f #{filename} #{configuration['database']}") end private diff --git a/activerecord/test/cases/tasks/postgresql_rake_test.rb b/activerecord/test/cases/tasks/postgresql_rake_test.rb index 7e7a469edd..f31896bc7f 100644 --- a/activerecord/test/cases/tasks/postgresql_rake_test.rb +++ b/activerecord/test/cases/tasks/postgresql_rake_test.rb @@ -227,7 +227,7 @@ def setup def test_structure_load filename = "awesome-file.sql" - Kernel.expects(:system).with("psql -f #{filename} my-app-db") + Kernel.expects(:system).with("psql -q -f #{filename} my-app-db") ActiveRecord::Tasks::DatabaseTasks.structure_load(@configuration, filename) end -- GitLab