From d896d4ea583ac4496a106f8e93ddf2a7ab612136 Mon Sep 17 00:00:00 2001 From: Nicolae Claudius Date: Sat, 17 Sep 2011 14:39:54 -0700 Subject: [PATCH] pg --- Gemfile | 9 ++++++++- Gemfile.lock | 2 ++ config/database.yml | 13 ++++++++----- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 848a82b..50b4730 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,14 @@ gem 'rails', '3.1.0' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' -gem 'sqlite3' +group :development do + gem 'sqlite3' +end + +group :production do + gem 'pg' +end + gem 'devise', '~> 1.4.5' #gem 'cancan', '~> 1.6.5' #gem "meta_where", "~> 1.0" # squeel ? diff --git a/Gemfile.lock b/Gemfile.lock index a5aa4dc..6a1bc49 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -98,6 +98,7 @@ GEM multi_json (1.0.3) nokogiri (1.5.0) orm_adapter (0.0.5) + pg (0.11.0) pjax-rails (0.1.4) jquery-rails polyglot (0.3.2) @@ -187,6 +188,7 @@ DEPENDENCIES devise (~> 1.4.5) factory_girl_rails (~> 1.2) jquery-rails + pg pjax-rails (~> 0.1.4) rails (= 3.1.0) rspec-rails (~> 2.6.1) diff --git a/config/database.yml b/config/database.yml index 51a4dd4..551498a 100644 --- a/config/database.yml +++ b/config/database.yml @@ -18,8 +18,11 @@ test: pool: 5 timeout: 5000 -production: - adapter: sqlite3 - database: db/production.sqlite3 - pool: 5 - timeout: 5000 +production: + encoding: unicode + adapter: postgresql + username: username + port: 5432 + host: hostname + database: database + password: password