diff options
Diffstat (limited to 'railties')
-rw-r--r-- | railties/configs/database.yml | 5 | ||||
-rw-r--r-- | railties/lib/tasks/databases.rake | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/railties/configs/database.yml b/railties/configs/database.yml index 52fa913b93..460ccf4236 100644 --- a/railties/configs/database.yml +++ b/railties/configs/database.yml @@ -6,6 +6,7 @@ # # Get the fast C bindings: # gem install mysql +# (on OS X: gem install mysql -- --include=/usr/local/lib) # And be sure to use new-style password hashing: # http://dev.mysql.com/doc/refman/5.0/en/old-client.html development: @@ -81,10 +82,10 @@ sqlite_example: # gem install sqlite3-ruby sqlite3_example: adapter: sqlite3 - dbfile: db/development.sqlite3 + database: db/development.sqlite3 # In-memory SQLite 3 database. Useful for tests. sqlite3_in_memory_example: adapter: sqlite3 - dbfile: ":memory:" + database: ":memory:"
\ No newline at end of file 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) |