aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-09-11 09:16:48 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-09-11 09:16:48 +0000
commite234115b630d05c0868a60eca65142ff3137064f (patch)
tree523c4596ee8a441b8f2135d7b60bf8b80d541621
parent2fc5cf78be465dbfb23e44eac3e26a3f62a9c2d9 (diff)
downloadrails-e234115b630d05c0868a60eca65142ff3137064f.tar.gz
rails-e234115b630d05c0868a60eca65142ff3137064f.tar.bz2
rails-e234115b630d05c0868a60eca65142ff3137064f.zip
Fixed clone_structure_to_test task for SQLite #1864 [jon@burningbush.us]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2198 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/lib/tasks/databases.rake2
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 06183484a4..27b4b6cab2 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed clone_structure_to_test task for SQLite #1864 [jon@burningbush.us]
+
* Added -m/--mime-types option to the WEBrick server, so you can specify a Apache-style mime.types file to load #2059 [ask@develooper.com]
* Added -c/--svn option to the generator that'll add new files and remove destroyed files using svn add/revert/remove as appropriate #2064 [kevin.clark@gmail.com]
diff --git a/railties/lib/tasks/databases.rake b/railties/lib/tasks/databases.rake
index 58b1d22a38..5ea69da240 100644
--- a/railties/lib/tasks/databases.rake
+++ b/railties/lib/tasks/databases.rake
@@ -28,7 +28,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"
- `#{abcs[RAILS_ENV]["adapter"]} #{abcs["test"]["dbfile"]} < db/#{RAILS_ENV}_structure.sql`
+ `#{abcs["test"]["adapter"]} #{abcs["test"]["dbfile"]} < db/#{RAILS_ENV}_structure.sql`
when "sqlserver"
`osql -E -S #{abcs["test"]["host"]} -d #{abcs["test"]["database"]} -i db\\#{RAILS_ENV}_structure.sql`
when "oci",