From 91853b8a0d437c469fa64d6269f7b3ce4c092a7d Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sun, 13 Nov 2005 01:12:48 +0000
Subject: 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
---
railties/CHANGELOG | 2 ++
railties/lib/tasks/databases.rake | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
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`
--
cgit v1.2.3