| @@ -43,9 +43,9 file 'config/database.yml' do | |||||
| 43 | case database |
|
43 | case database | |
| 44 | when 'mysql' |
|
44 | when 'mysql' | |
| 45 | dev_conf = {'adapter' => (RUBY_VERSION >= '1.9' ? 'mysql2' : 'mysql'), |
|
45 | dev_conf = {'adapter' => (RUBY_VERSION >= '1.9' ? 'mysql2' : 'mysql'), | |
| 46 | 'database' => dev_db_name, 'host' => 'localhost', |
|
46 | 'database' => dev_db_name, 'host' => 'localhost', | |
| 47 | 'username' => 'jenkins', 'password' => 'jenkins', |
|
47 | 'username' => 'jenkins', 'password' => 'jenkins', | |
| 48 | 'encoding' => 'utf8'} |
|
48 | 'encoding' => 'utf8'} | |
| 49 | test_conf = dev_conf.merge('database' => test_db_name) |
|
49 | test_conf = dev_conf.merge('database' => test_db_name) | |
| 50 | when 'postgresql' |
|
50 | when 'postgresql' | |
| 51 | dev_conf = {'adapter' => 'postgresql', 'database' => dev_db_name, |
|
51 | dev_conf = {'adapter' => 'postgresql', 'database' => dev_db_name, | |
General Comments 0
You need to be logged in to leave comments.
Login now