diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-13 11:01:02 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-13 11:01:02 -0800 |
| commit | 957da557027e5278b80165b0cb4f48dd837045af (patch) | |
| tree | 7f080787df3d7bfa80bd434395a221a26c0d45ef /activerecord | |
| parent | 04c0aea47ab6530af3e9e6aa7c8edb26e6dfdbe7 (diff) | |
| parent | 745fbd1b4cef120ba468e475d5c7686ff136a553 (diff) | |
| download | rails-957da557027e5278b80165b0cb4f48dd837045af.tar.gz rails-957da557027e5278b80165b0cb4f48dd837045af.tar.bz2 rails-957da557027e5278b80165b0cb4f48dd837045af.zip | |
Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare
Fix usage of psql in db:test:prepare
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index 822b51e838..821410f42c 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -420,7 +420,7 @@ db_namespace = namespace :db do end when /postgresql/ set_psql_env(abcs[env]) - `psql -f "#{filename}" #{abcs[env]['database']} #{abcs[env]['template']}` + `psql -f "#{filename}" #{abcs[env]['database']}` when /sqlite/ dbfile = abcs[env]['database'] `sqlite3 #{dbfile} < "#{filename}"` |