Skip to content

Commit

Permalink
Defaulting postgresql user to postgres, to match Travis' expectations…
Browse files Browse the repository at this point in the history
…. And adding PG database to Travis setup script.
  • Loading branch information
pat committed Aug 22, 2011
1 parent 829bd4d commit 4b7ce19
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -7,3 +7,4 @@ branches:
- rails3
before_script:
- "mysql -e 'create database thinking_sphinx;' > /dev/null"
- "psql -c 'create database thinking_sphinx;' -U postgres >/dev/null"
2 changes: 1 addition & 1 deletion lib/cucumber/thinking_sphinx/internal_world.rb
Expand Up @@ -18,7 +18,7 @@ def initialize

@adapter = (ENV['DATABASE'] || 'mysql').gsub /^mysql$/, 'mysql2'
@database = 'thinking_sphinx'
@username = 'root'
@username = @adapter[/mysql/] ? 'root' : 'postgres'
# @password = 'thinking_sphinx'
@host = 'localhost'
end
Expand Down

0 comments on commit 4b7ce19

Please sign in to comment.