diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-06-27 09:03:34 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-06-27 09:03:34 -0700 |
| commit | 565d54d9ec167a5b9caf91bb53505d1e98c0ded5 (patch) | |
| tree | e64ee98eb17c386af4ea10c2352bc6941aab4eda /activerecord/lib/active_record | |
| parent | 52f6e47682003c83b0466bf5e140ee302498a226 (diff) | |
| parent | 6498bbe5146981dd6ca02f99dba5e10c18d8bc34 (diff) | |
| download | rails-565d54d9ec167a5b9caf91bb53505d1e98c0ded5.tar.gz rails-565d54d9ec167a5b9caf91bb53505d1e98c0ded5.tar.bz2 rails-565d54d9ec167a5b9caf91bb53505d1e98c0ded5.zip | |
Merge pull request #6880 from kennyj/fix_20120628
Fix wrong testcase for db:test:prepare, and wrong environment in AR rake task.
Diffstat (limited to 'activerecord/lib/active_record')
| -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 1dcd0a5a32..c6ec946b73 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -313,7 +313,7 @@ db_namespace = namespace :db do filename = ENV['DB_STRUCTURE'] || File.join(Rails.root, "db", "structure.sql") case abcs[env]['adapter'] when /mysql/, /postgresql/, /sqlite/ - ActiveRecord::Tasks::DatabaseTasks.structure_load(abcs[Rails.env], filename) + ActiveRecord::Tasks::DatabaseTasks.structure_load(abcs[env], filename) when 'sqlserver' `sqlcmd -S #{abcs[env]['host']} -d #{abcs[env]['database']} -U #{abcs[env]['username']} -P #{abcs[env]['password']} -i #{filename}` when 'oci', 'oracle' |