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-23 11:03:49 -0800 |
| commit | ecff25cda6917a07c7bcb4ed0865c75d16164306 (patch) | |
| tree | 1e86f0669dd835ce570bb81d0c52806e2ebb65a5 /activerecord | |
| parent | 93f1667e91c7fa6d2136bcd64f8c8a1231da4a7f (diff) | |
| download | rails-ecff25cda6917a07c7bcb4ed0865c75d16164306.tar.gz rails-ecff25cda6917a07c7bcb4ed0865c75d16164306.tar.bz2 rails-ecff25cda6917a07c7bcb4ed0865c75d16164306.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 2df83514bd..b94df4262a 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -424,7 +424,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}"` |