From 592696045af9a4ae6a7f0bd2a6ce1703b64cfa28 Mon Sep 17 00:00:00 2001
From: Marcin Kulik <marcin.kulik@gmail.com>
Date: Fri, 12 Oct 2012 21:46:15 +0200
Subject: [PATCH] Switch to postgres in development

---
 Gemfile                     |  3 +--
 Gemfile.lock                |  2 --
 config/database.yml.example | 23 ++++++++++-------------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0fc5f8e..9f241f0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,6 +3,7 @@ source 'http://rubygems.org'
 gem 'rails'
 gem 'jquery-rails'
 gem 'tzinfo'
+gem 'pg'
 gem 'carrierwave'
 gem 'omniauth'
 gem 'omniauth-twitter'
@@ -27,7 +28,6 @@ group :assets do
 end
 
 group :test, :development do
-  gem 'mysql2'
   gem 'rspec-rails'
   gem 'factory_girl_rails'
   gem 'awesome_print', :require => 'ap'
@@ -55,6 +55,5 @@ group :bugfix do
 end
 
 group :production do
-  gem 'pg'
   gem 'dalli'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index eda525a..597c2d3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -134,7 +134,6 @@ GEM
     mime-types (1.17.2)
     multi_json (1.0.4)
     multipart-post (1.1.5)
-    mysql2 (0.3.11)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-ssh (2.3.0)
@@ -276,7 +275,6 @@ DEPENDENCIES
   jquery-rails
   kaminari
   libnotify
-  mysql2
   omniauth
   omniauth-github
   omniauth-twitter
diff --git a/config/database.yml.example b/config/database.yml.example
index 0d5fc60..7c4ad6b 100644
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -6,32 +6,29 @@
 # And be sure to use new-style password hashing:
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
-  adapter: mysql2
-  encoding: utf8
+  adapter: postgresql
+  encoding: unicode
   database: ascii_io_development
-  pool: 25
-  username: root
+  pool: 5
+  username: asciiio
   password:
-  socket: /tmp/mysql.sock
 
 
 # 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: mysql2
-  encoding: utf8
+  adapter: postgresql
+  encoding: unicode
   database: ascii_io_test
   pool: 5
-  username: root
+  username: asciiio
   password:
-  socket: /tmp/mysql.sock
 
 production:
-  adapter: mysql2
-  encoding: utf8
+  adapter: postgresql
+  encoding: unicode
   database: ascii_io_production
   pool: 5
-  username: root
+  username: asciiio
   password:
-  socket: /tmp/mysql.sock