summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/tasks/ci.rake16
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index ab7eb2341..0834d874d 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -45,16 +45,24 @@ file 'config/database.yml' do
case database
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)
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)
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")
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)
else
abort "Unknown database"