Permalink
Browse files

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
  • Loading branch information...
tenderlove committed May 1, 2013
1 parent d881f61 commit 1db8f9d5fdce7bead9bfa210163c0df09f864dd2
@@ -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.
@@ -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
@@ -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

0 comments on commit 1db8f9d

Please sign in to comment.