add pg

Gemfile

@@ -3,8 +3,7 @@ source 'http://ruby.taobao.org'
 
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '4.2.2'
 gem 'rails', '4.2.2'
-# Use sqlite3 as the database for Active Record
-gem 'sqlite3'
+gem 'pg'
 # Use SCSS for stylesheets
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets
 # Use Uglifier as compressor for JavaScript assets

Gemfile.lock

@@ -90,6 +90,7 @@ GEM
     nokogiri (1.6.6.2)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
       mini_portile (~> 0.6.0)
     orm_adapter (0.5.0)
     orm_adapter (0.5.0)
+    pg (0.18.4)
     rack (1.6.4)
     rack (1.6.4)
     rack-test (0.6.3)
     rack-test (0.6.3)
       rack (>= 1.0)
       rack (>= 1.0)
@@ -146,7 +147,6 @@ GEM
       actionpack (>= 3.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
       sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.10)
     thor (0.19.1)
     thor (0.19.1)
     thread_safe (0.3.5)
     thread_safe (0.3.5)
     tilt (1.4.1)
     tilt (1.4.1)
@@ -175,12 +175,15 @@ DEPENDENCIES
   devise
   devise
   jbuilder (~> 2.0)
   jbuilder (~> 2.0)
   jquery-rails
   jquery-rails
+  pg
   rails (= 4.2.2)
   rails (= 4.2.2)
   react-rails (~> 1.0)
   react-rails (~> 1.0)
   sass-rails (~> 5.0)
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)
   sdoc (~> 0.4.0)
   spring
   spring
-  sqlite3
   turbolinks
   turbolinks
   uglifier (>= 1.3.0)
   uglifier (>= 1.3.0)
   web-console (~> 2.0)
   web-console (~> 2.0)
+
+BUNDLED WITH
+   1.11.2

config/database.yml

-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-#
 default: &default
 default: &default
-  adapter: sqlite3
+  adapter: postgresql
+  encoding: unicode
+  # For details on connection pooling, see rails configuration guide
+  # http://guides.rubyonrails.org/configuring.html#database-pooling
   pool: 5
   pool: 5
-  timeout: 5000
-
-development:
-  <<: *default
-  database: db/development.sqlite3
-
-# 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:
-  <<: *default
-  database: db/test.sqlite3
-
-production:
-  <<: *default
-  database: db/production.sqlite3