spec/dummy/config/database.yml in enju_bookmark-0.1.2.pre20 vs spec/dummy/config/database.yml in enju_bookmark-0.1.2.pre21
- old
+ new
@@ -1,25 +1,30 @@
-# SQLite version 3.x
-# gem install sqlite3
-#
-# Ensure the SQLite 3 gem is defined in your Gemfile
-# gem 'sqlite3'
-development:
+sqlite: &sqlite
adapter: sqlite3
- database: db/development.sqlite3
+ database: db/<%= Rails.env %>.sqlite3
+
+mysql: &mysql
+ adapter: mysql2
+ username: root
+ password:
+ database: enju_<%= Rails.env %>
+
+postgresql: &postgresql
+ adapter: postgresql
+ username: postgres
+ password:
+ database: enju_<%= Rails.env %>
+
+defaults: &defaults
pool: 5
timeout: 5000
+ host: localhost
+ <<: *<%= ENV['DB'] || "sqlite" %>
-# 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.
+development:
+ <<: *defaults
+
test:
- adapter: sqlite3
- database: db/test.sqlite3
- pool: 5
- timeout: 5000
+ <<: *defaults
production:
- adapter: sqlite3
- database: db/production.sqlite3
- pool: 5
- timeout: 5000
+ <<: *defaults