Browse files

Update datbase.yml

  • Loading branch information...
1 parent 4275a16 commit c2991acb89baa2fc6ccb094828453d099583678e @ludo committed Jul 29, 2011
Showing with 11 additions and 42 deletions.
  1. +1 −0 .gitignore
  2. +10 −42 config/database.yml
View
1 .gitignore
@@ -4,3 +4,4 @@ db/*.sqlite3
log/*.log
tmp/
.sass-cache/
+vendor/gems
View
52 config/database.yml
@@ -1,45 +1,13 @@
-# MySQL. Versions 4.1 and 5.0 are recommended.
-#
-# Install the MYSQL driver
-# gem install mysql2
-#
-# Ensure the MySQL gem is defined in your Gemfile
-# gem 'mysql2'
-#
-# And be sure to use new-style password hashing:
-# http://dev.mysql.com/doc/refman/5.0/en/old-client.html
development:
- adapter: mysql2
- encoding: utf8
- reconnect: false
- database: twatter_development
+ adapter: sqlite3
+ database: db/development.sqlite3
pool: 5
- username: root
- password:
- socket: /tmp/mysql.sock
+ timeout: 3000
-# 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: mysql2
- encoding: utf8
- reconnect: false
- database: twatter_test
- pool: 5
- username: root
- password:
- socket: /tmp/mysql.sock
-
-production:
- adapter: mysql2
- encoding: utf8
- reconnect: false
- database: twatter_production
- pool: 5
- username: root
- password:
- socket: /tmp/mysql.sock
-
-cucumber:
- <<: *test
+test:
+ adapter: postgresql
+ database: test_twatter
+ username: test_twatter
+ password: beheer
+ host: localhost
+ encoding: UTF8

0 comments on commit c2991ac

Please sign in to comment.