Permalink
Browse files

switched to pg only for production

  • Loading branch information...
1 parent 4835c6a commit 86380719c778ecbbcd551cc22c144286542ba7c9 @anirudhtodi anirudhtodi committed Apr 18, 2012
Showing with 18 additions and 4 deletions.
  1. +6 −2 Gemfile
  2. +4 −2 Gemfile.lock
  3. +8 −0 config/database.yml
View
@@ -5,8 +5,8 @@ gem 'rails', '3.2.3'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
-# gem 'sqlite3'
-gem 'mysql2'
+gem 'sqlite3', '1.3.5'
+# gem 'mysql2'
gem 'json'
@@ -24,6 +24,10 @@ end
gem 'jquery-rails'
+group :production do
+ gem 'pg'
+end
+
# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'
View
@@ -53,7 +53,7 @@ GEM
treetop (~> 1.4.8)
mime-types (1.18)
multi_json (1.3.1)
- mysql2 (0.3.11)
+ pg (0.13.2)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
@@ -89,6 +89,7 @@ GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
+ sqlite3 (1.3.5)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
@@ -106,7 +107,8 @@ DEPENDENCIES
coffee-rails (~> 3.2.1)
jquery-rails
json
- mysql2
+ pg
rails (= 3.2.3)
sass-rails (~> 3.2.3)
+ sqlite3 (= 1.3.5)
uglifier (>= 1.0.3)
View
@@ -3,6 +3,14 @@
#
# Ensure the SQLite 3 gem is defined in your Gemfile
# gem 'sqlite3'
+# development:
+# adapter: mysql2
+# encoding: utf8
+# database: blog_development
+# pool: 5
+# username: root
+# password:
+# socket: /tmp/mysql.sock
development:
adapter: sqlite3
database: db/development.sqlite3

0 comments on commit 8638071

Please sign in to comment.