Permalink
Browse files

use new db config

  • Loading branch information...
1 parent 97281af commit dd835bd352c87836eaca1a662693e519aa5a6bb9 @FuriKuri committed Nov 6, 2012
Showing with 16 additions and 7 deletions.
  1. +2 −0 Gemfile.lock
  2. +14 −7 config/database.yml
View
@@ -55,6 +55,7 @@ GEM
treetop (~> 1.4.8)
mime-types (1.19)
multi_json (1.3.6)
+ mysql2 (0.3.11-x86-mingw32)
pg (0.14.1-x86-mingw32)
polyglot (0.3.3)
rack (1.4.1)
@@ -113,6 +114,7 @@ PLATFORMS
DEPENDENCIES
coffee-rails (~> 3.2.1)
jquery-rails
+ mysql2
pg
rails (= 3.2.8)
sass-rails (~> 3.2.3)
View
@@ -1,18 +1,18 @@
sqlite: &sqlite
adapter: sqlite3
- database: db/<%= Rails.env %>.sqlite3
+ database: db/test.sqlite3
mysql: &mysql
adapter: mysql2
username: root
password:
- database: share_your_books_<%= Rails.env %>
+ database: share_your_books_test
postgresql: &postgresql
adapter: postgresql
username: postgres
password:
- database: share_your_books_<%= Rails.env %>
+ database: share_your_books_test
min_messages: ERROR
defaults: &defaults
@@ -21,11 +21,18 @@ defaults: &defaults
host: localhost
<<: *<%= ENV['DB'] || "sqlite" %>
-development:
- <<: *defaults
-
test:
<<: *defaults
+development:
+ adapter: sqlite3
+ database: db/development.sqlite3
+ pool: 5
+ timeout: 5000
+
production:
- <<: *defaults
+ adapter: sqlite3
+ database: db/production.sqlite3
+ pool: 5
+ timeout: 5000
+

0 comments on commit dd835bd

Please sign in to comment.