aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2005-11-13 01:12:48 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2005-11-13 01:12:48 +0000
commit91853b8a0d437c469fa64d6269f7b3ce4c092a7d (patch)
treed2e370d8fd07fd139afc46b6cc06cb650e711566 /railties/lib
parent54dfb291510135a99f8316bfc7279ad0ca9485c6 (diff)
downloadrails-91853b8a0d437c469fa64d6269f7b3ce4c092a7d.tar.gz
rails-91853b8a0d437c469fa64d6269f7b3ce4c092a7d.tar.bz2
rails-91853b8a0d437c469fa64d6269f7b3ce4c092a7d.zip
SQLite: the clone_structure_to_test Rake task should always use the test environment. References #2846.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2990 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/tasks/databases.rake2
1 files changed, 1 insertions, 1 deletions
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`