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

+*   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.

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

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