@@ -45,16 +45,24 file 'config/database.yml' do | |||
|
45 | 45 | |
|
46 | 46 | case database |
|
47 | 47 | when 'mysql' |
|
48 | dev_conf = {'adapter' => (RUBY_VERSION >= '1.9' ? 'mysql2' : 'mysql'), 'database' => dev_db_name, 'host' => 'localhost', 'username' => 'jenkins', 'password' => 'jenkins', 'encoding' => 'utf8'} | |
|
48 | dev_conf = {'adapter' => (RUBY_VERSION >= '1.9' ? 'mysql2' : 'mysql'), | |
|
49 | 'database' => dev_db_name, 'host' => 'localhost', | |
|
50 | 'username' => 'jenkins', 'password' => 'jenkins', | |
|
51 | 'encoding' => 'utf8'} | |
|
49 | 52 | test_conf = dev_conf.merge('database' => test_db_name) |
|
50 | 53 | when 'postgresql' |
|
51 |
dev_conf = {'adapter' => 'postgresql', 'database' => dev_db_name, |
|
|
54 | dev_conf = {'adapter' => 'postgresql', 'database' => dev_db_name, | |
|
55 | 'host' => 'localhost', | |
|
56 | 'username' => 'jenkins', 'password' => 'jenkins'} | |
|
52 | 57 | test_conf = dev_conf.merge('database' => test_db_name) |
|
53 | 58 | when 'sqlite3' |
|
54 |
dev_conf = {'adapter' => 'sqlite3', |
|
|
59 | dev_conf = {'adapter' => 'sqlite3', | |
|
60 | 'database' => "db/#{dev_db_name}.sqlite3"} | |
|
55 | 61 | test_conf = dev_conf.merge('database' => "db/#{test_db_name}.sqlite3") |
|
56 | 62 | when 'sqlserver' |
|
57 |
dev_conf = {'adapter' => 'sqlserver', 'database' => dev_db_name, |
|
|
63 | dev_conf = {'adapter' => 'sqlserver', 'database' => dev_db_name, | |
|
64 | 'host' => 'mssqlserver', 'port' => 1433, | |
|
65 | 'username' => 'jenkins', 'password' => 'jenkins'} | |
|
58 | 66 | test_conf = dev_conf.merge('database' => test_db_name) |
|
59 | 67 | else |
|
60 | 68 | abort "Unknown database" |
General Comments 0
You need to be logged in to leave comments.
Login now