ci.rake: code format cleanup
git-svn-id: http://svn.redmine.org/redmine/trunk@12257 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
882c4495c0
commit
0707c7a12d
|
@ -45,16 +45,24 @@ file 'config/database.yml' do
|
||||||
|
|
||||||
case database
|
case database
|
||||||
when 'mysql'
|
when 'mysql'
|
||||||
dev_conf = {'adapter' => (RUBY_VERSION >= '1.9' ? 'mysql2' : 'mysql'), 'database' => dev_db_name, 'host' => 'localhost', 'username' => 'jenkins', 'password' => 'jenkins', 'encoding' => 'utf8'}
|
dev_conf = {'adapter' => (RUBY_VERSION >= '1.9' ? 'mysql2' : 'mysql'),
|
||||||
|
'database' => dev_db_name, 'host' => 'localhost',
|
||||||
|
'username' => 'jenkins', 'password' => 'jenkins',
|
||||||
|
'encoding' => 'utf8'}
|
||||||
test_conf = dev_conf.merge('database' => test_db_name)
|
test_conf = dev_conf.merge('database' => test_db_name)
|
||||||
when 'postgresql'
|
when 'postgresql'
|
||||||
dev_conf = {'adapter' => 'postgresql', 'database' => dev_db_name, 'host' => 'localhost', 'username' => 'jenkins', 'password' => 'jenkins'}
|
dev_conf = {'adapter' => 'postgresql', 'database' => dev_db_name,
|
||||||
|
'host' => 'localhost',
|
||||||
|
'username' => 'jenkins', 'password' => 'jenkins'}
|
||||||
test_conf = dev_conf.merge('database' => test_db_name)
|
test_conf = dev_conf.merge('database' => test_db_name)
|
||||||
when 'sqlite3'
|
when 'sqlite3'
|
||||||
dev_conf = {'adapter' => 'sqlite3', 'database' => "db/#{dev_db_name}.sqlite3"}
|
dev_conf = {'adapter' => 'sqlite3',
|
||||||
|
'database' => "db/#{dev_db_name}.sqlite3"}
|
||||||
test_conf = dev_conf.merge('database' => "db/#{test_db_name}.sqlite3")
|
test_conf = dev_conf.merge('database' => "db/#{test_db_name}.sqlite3")
|
||||||
when 'sqlserver'
|
when 'sqlserver'
|
||||||
dev_conf = {'adapter' => 'sqlserver', 'database' => dev_db_name, 'host' => 'mssqlserver', 'port' => 1433, 'username' => 'jenkins', 'password' => 'jenkins'}
|
dev_conf = {'adapter' => 'sqlserver', 'database' => dev_db_name,
|
||||||
|
'host' => 'mssqlserver', 'port' => 1433,
|
||||||
|
'username' => 'jenkins', 'password' => 'jenkins'}
|
||||||
test_conf = dev_conf.merge('database' => test_db_name)
|
test_conf = dev_conf.merge('database' => test_db_name)
|
||||||
else
|
else
|
||||||
abort "Unknown database"
|
abort "Unknown database"
|
||||||
|
|
Loading…
Reference in New Issue