Browse Source

Merge pull request #15 from zflat/cleaner-db

Cleaner db
development
Dylan Peerenboom 10 years ago
parent
commit
210d9cf058
  1. 3
      .travis.yml
  2. 59
      config/database.yml
  3. 5
      config/database.yml.travis

3
.travis.yml

@ -5,4 +5,5 @@ before_install:
- "export DISPLAY=:99.0" - "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start" - "sh -e /etc/init.d/xvfb start"
before_script: before_script:
- psql -c 'create database bike_bike_test;' -U postgres - cp config/database.yml.travis config/database.yml
- psql -c 'create database travis_ci_test;' -U postgres

59
config/database.yml

@ -1,59 +0,0 @@
# PostgreSQL. Versions 8.2 and up are supported.
#
# Install the pg driver:
# gem install pg
# On OS X with Homebrew:
# gem install pg -- --with-pg-config=/usr/local/bin/pg_config
# On OS X with MacPorts:
# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
# On Windows:
# gem install pg
# Choose the win32 build.
# Install PostgreSQL and put its /bin directory on your path.
#
# Configure Using Gemfile
# gem 'pg'
#
development:
adapter: postgresql
encoding: unicode
database: bike_bike_dev
username: dylan
password: godwin
host: 127.0.0.1
port: 5432
pool: 5
# Minimum log levels, in increasing order:
# debug5, debug4, debug3, debug2, debug1,
# log, notice, warning, error, fatal, and panic
# Defaults to warning.
#min_messages: notice
# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production.
test: &test
adapter: postgresql
encoding: unicode
database: bike_bike_test
username: dylan
password: godwin
host: 127.0.0.1
port: 5432
pool: 5
production:
adapter: postgresql
encoding: unicode
database: bike_bike
username: dylan
password: godwin
host: 127.0.0.1
port: 5432
pool: 5
cucumber:
<<: *test

5
config/database.yml.travis

@ -0,0 +1,5 @@
test:
adapter: postgresql
encoding: unicode
database: travis_ci_test
username: postgres
Loading…
Cancel
Save