diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/databases.rake | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 38f0f470a9..f981a8b5f1 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* SQLite: the clone_structure_to_test Rake task should always use the test environment. #2846 [Rick Olson] + * Make sure that legacy db tasks also reference :database for SQLite #2830 [kazuhiko@fdiary.net] * Pass __FILE__ when evaluating plugins' init.rb. #2817 [james.adam@gmail.com] diff --git a/railties/lib/tasks/databases.rake b/railties/lib/tasks/databases.rake index 64f3a0c2ee..7ec2c81914 100644 --- a/railties/lib/tasks/databases.rake +++ b/railties/lib/tasks/databases.rake @@ -78,7 +78,7 @@ task :clone_structure_to_test => [ :db_structure_dump, :purge_test_database ] do ENV['PGPASSWORD'] = abcs["test"]["password"].to_s if abcs["test"]["password"] `psql -U "#{abcs["test"]["username"]}" -f db/#{RAILS_ENV}_structure.sql #{abcs["test"]["database"]}` when "sqlite", "sqlite3" - dbfile = abcs[RAILS_ENV]["database"] || abcs[RAILS_ENV]["dbfile"] + dbfile = abcs["test"]["database"] || abcs["test"]["dbfile"] `#{abcs["test"]["adapter"]} #{dbfile} < db/#{RAILS_ENV}_structure.sql` when "sqlserver" `osql -E -S #{abcs["test"]["host"]} -d #{abcs["test"]["database"]} -i db\\#{RAILS_ENV}_structure.sql` |