Switch to postgres in development

openid
Marcin Kulik 12 years ago
parent 07e6c6d8a1
commit 592696045a

@ -3,6 +3,7 @@ source 'http://rubygems.org'
gem 'rails' gem 'rails'
gem 'jquery-rails' gem 'jquery-rails'
gem 'tzinfo' gem 'tzinfo'
gem 'pg'
gem 'carrierwave' gem 'carrierwave'
gem 'omniauth' gem 'omniauth'
gem 'omniauth-twitter' gem 'omniauth-twitter'
@ -27,7 +28,6 @@ group :assets do
end end
group :test, :development do group :test, :development do
gem 'mysql2'
gem 'rspec-rails' gem 'rspec-rails'
gem 'factory_girl_rails' gem 'factory_girl_rails'
gem 'awesome_print', :require => 'ap' gem 'awesome_print', :require => 'ap'
@ -55,6 +55,5 @@ group :bugfix do
end end
group :production do group :production do
gem 'pg'
gem 'dalli' gem 'dalli'
end end

@ -134,7 +134,6 @@ GEM
mime-types (1.17.2) mime-types (1.17.2)
multi_json (1.0.4) multi_json (1.0.4)
multipart-post (1.1.5) multipart-post (1.1.5)
mysql2 (0.3.11)
net-scp (1.0.4) net-scp (1.0.4)
net-ssh (>= 1.99.1) net-ssh (>= 1.99.1)
net-ssh (2.3.0) net-ssh (2.3.0)
@ -276,7 +275,6 @@ DEPENDENCIES
jquery-rails jquery-rails
kaminari kaminari
libnotify libnotify
mysql2
omniauth omniauth
omniauth-github omniauth-github
omniauth-twitter omniauth-twitter

@ -6,32 +6,29 @@
# And be sure to use new-style password hashing: # And be sure to use new-style password hashing:
# http://dev.mysql.com/doc/refman/5.0/en/old-client.html # http://dev.mysql.com/doc/refman/5.0/en/old-client.html
development: development:
adapter: mysql2 adapter: postgresql
encoding: utf8 encoding: unicode
database: ascii_io_development database: ascii_io_development
pool: 25 pool: 5
username: root username: asciiio
password: password:
socket: /tmp/mysql.sock
# Warning: The database defined as "test" will be erased and # Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake". # re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production. # Do not set this db to the same as development or production.
test: test:
adapter: mysql2 adapter: postgresql
encoding: utf8 encoding: unicode
database: ascii_io_test database: ascii_io_test
pool: 5 pool: 5
username: root username: asciiio
password: password:
socket: /tmp/mysql.sock
production: production:
adapter: mysql2 adapter: postgresql
encoding: utf8 encoding: unicode
database: ascii_io_production database: ascii_io_production
pool: 5 pool: 5
username: root username: asciiio
password: password:
socket: /tmp/mysql.sock

Loading…
Cancel
Save