提交 a1c88273 编写于 作者: J Jeremy Kemper

Skip databases that couldn't be created.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6900 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
上级 186ac4cd
...@@ -12,9 +12,13 @@ namespace :db do ...@@ -12,9 +12,13 @@ namespace :db do
@charset = ENV['CHARSET'] || 'utf8' @charset = ENV['CHARSET'] || 'utf8'
@collation = ENV['COLLATION'] || 'utf8_general_ci' @collation = ENV['COLLATION'] || 'utf8_general_ci'
ActiveRecord::Base.establish_connection(config.merge({'database' => nil})) begin
ActiveRecord::Base.connection.create_database(config['database'], {:charset => @charset, :collation => @collation}) ActiveRecord::Base.establish_connection(config.merge({'database' => nil}))
ActiveRecord::Base.establish_connection(config) ActiveRecord::Base.connection.create_database(config['database'], {:charset => @charset, :collation => @collation})
ActiveRecord::Base.establish_connection(config)
rescue
$stderr.puts "Couldn't create database for #{config.inspect}"
end
when 'postgresql' when 'postgresql'
`createdb "#{config['database']}" -E utf8` `createdb "#{config['database']}" -E utf8`
when 'sqlite' when 'sqlite'
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册