From c21fdf31a52cbe507ff675815c29e5eef39e0bbb Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 30 Oct 2005 08:10:04 +0000 Subject: Changed :dbfile to :database for SQLite adapter for consistency (old key still works as an alias) (closes #2644) [Dan Peterson] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2825 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/lib/tasks/databases.rake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'railties/lib/tasks/databases.rake') diff --git a/railties/lib/tasks/databases.rake b/railties/lib/tasks/databases.rake index 4a2efa98ee..97c07f97f9 100644 --- a/railties/lib/tasks/databases.rake +++ b/railties/lib/tasks/databases.rake @@ -55,7 +55,7 @@ task :db_structure_dump => :environment do else raise "Task not supported by '#{abcs["test"]["adapter"]}'" end - + if ActiveRecord::Base.connection.supports_migrations? File.open("db/#{RAILS_ENV}_structure.sql", "a") { |f| f << ActiveRecord::Base.connection.dump_schema_information } end @@ -65,7 +65,7 @@ desc "Recreate the test databases from the development structure" task :clone_structure_to_test => [ :db_structure_dump, :purge_test_database ] do abcs = ActiveRecord::Base.configurations case abcs["test"]["adapter"] - when "mysql" + when "mysql" ActiveRecord::Base.establish_connection(:test) ActiveRecord::Base.connection.execute('SET foreign_key_checks = 0') IO.readlines("db/#{RAILS_ENV}_structure.sql").join.split("\n\n").each do |table| @@ -80,7 +80,7 @@ task :clone_structure_to_test => [ :db_structure_dump, :purge_test_database ] do `#{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", + when "oci" ActiveRecord::Base.establish_connection(:test) IO.readlines("db/#{RAILS_ENV}_structure.sql").join.split(";\n\n").each do |ddl| ActiveRecord::Base.connection.execute(ddl) -- cgit v1.2.3