diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-10-06 02:13:36 -0700 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-10-06 02:13:36 -0700 |
| commit | 33799c8fc3c7955f35e53943920e477411cce2a6 (patch) | |
| tree | ece72ba75c6ab5713e166fda44e008061829fae9 /activerecord/lib/active_record | |
| parent | 0adab7c29baf520f7bef3a4c7f8a0d2deb6916fb (diff) | |
| parent | 80e0cd32905d74b7f0779807d9b2428d5d0ce64b (diff) | |
| download | rails-33799c8fc3c7955f35e53943920e477411cce2a6.tar.gz rails-33799c8fc3c7955f35e53943920e477411cce2a6.tar.bz2 rails-33799c8fc3c7955f35e53943920e477411cce2a6.zip | |
Merge pull request #3203 from jrmehle/fix_clone_structure
db:test:clone_structure if path to .sql file contains spaces or dashes
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index f4a813d704..3f6c98f8dd 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -424,10 +424,10 @@ db_namespace = namespace :db do ENV['PGHOST'] = abcs['test']['host'] if abcs['test']['host'] ENV['PGPORT'] = abcs['test']['port'].to_s if abcs['test']['port'] ENV['PGPASSWORD'] = abcs['test']['password'].to_s if abcs['test']['password'] - `psql -U "#{abcs['test']['username']}" -f #{Rails.root}/db/#{Rails.env}_structure.sql #{abcs['test']['database']} #{abcs['test']['template']}` + `psql -U "#{abcs['test']['username']}" -f "#{Rails.root}/db/#{Rails.env}_structure.sql" #{abcs['test']['database']} #{abcs['test']['template']}` when /sqlite/ dbfile = abcs['test']['database'] || abcs['test']['dbfile'] - `sqlite3 #{dbfile} < #{Rails.root}/db/#{Rails.env}_structure.sql` + `sqlite3 #{dbfile} < "#{Rails.root}/db/#{Rails.env}_structure.sql"` when 'sqlserver' `sqlcmd -S #{abcs['test']['host']} -d #{abcs['test']['database']} -U #{abcs['test']['username']} -P #{abcs['test']['password']} -i db\\#{Rails.env}_structure.sql` when 'oci', 'oracle' |