Skip to content
Browse files

Switch to PG

  • Loading branch information...
1 parent 7b3730e commit 9c9a51226dbd2f09bb05348802b1540f9d06c65c @marktabler committed
Showing with 14 additions and 11 deletions.
  1. +1 −0 Gemfile
  2. +2 −0 Gemfile.lock
  3. +11 −11 config/database.yml
View
1 Gemfile
@@ -3,6 +3,7 @@ source 'https://rubygems.org'
ruby '2.0.0'
gem 'bootstrap-sass'
+gem 'pg'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.0.0.rc1'
View
2 Gemfile.lock
@@ -54,6 +54,7 @@ GEM
mime-types (1.23)
minitest (4.7.4)
multi_json (1.7.6)
+ pg (0.15.1)
polyglot (0.3.3)
rack (1.5.2)
rack-test (0.6.2)
@@ -115,6 +116,7 @@ DEPENDENCIES
coffee-rails (~> 4.0.0)
jbuilder (~> 1.0.1)
jquery-rails
+ pg
rails (= 4.0.0.rc1)
sass-rails (~> 4.0.0.rc1)
sdoc
View
22 config/database.yml
@@ -4,22 +4,22 @@
# Ensure the SQLite 3 gem is defined in your Gemfile
# gem 'sqlite3'
development:
- adapter: sqlite3
- database: db/development.sqlite3
+ adapter: postgresql
+ encoding: unicode
+ database: oberon_development
pool: 5
- timeout: 5000
# 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:
- adapter: sqlite3
- database: db/test.sqlite3
+ adapter: postgresql
+ encoding: unicode
+ database: oberon_test
pool: 5
- timeout: 5000
-production:
- adapter: sqlite3
- database: db/production.sqlite3
- pool: 5
- timeout: 5000
+# production:
+# adapter: sqlite3
+# database: db/production.sqlite3
+# pool: 5
+# timeout: 5000

0 comments on commit 9c9a512

Please sign in to comment.
Something went wrong with that request. Please try again.