Permalink
Browse files

Use mysql2 gem instead of mysql, and remove sqlite.

  • Loading branch information...
1 parent 670e3ec commit 53d78447ad25a3d2403bd56cac63604198844ff1 @kaleworsley committed Mar 13, 2012
Showing with 21 additions and 17 deletions.
  1. +1 −3 Gemfile
  2. +2 −2 Gemfile.lock
  3. +18 −12 config/database.example.yml
View
@@ -1,9 +1,7 @@
source :gemcutter
gem "rails", "~> 2.3.11"
gem "rake", :require => false
-gem "sqlite3-ruby", :require => "sqlite3"
-
-gem "mysql"
+gem "mysql2", "~> 0.2.0"
gem "authlogic", "~> 2.1.6"
gem "will_paginate", "~> 2.3.16"
View
@@ -28,7 +28,7 @@ GEM
linecache (0.46)
rbx-require-relative (> 0.0.4)
mime-types (1.17.2)
- mysql (2.8.1)
+ mysql2 (0.2.18)
nokogiri (1.5.0)
oauth (0.4.5)
paperclip (2.7.0)
@@ -90,7 +90,7 @@ DEPENDENCIES
exception_notification (~> 2.3.3.0)
factory_girl (~> 1.3.2)
foreman
- mysql
+ mysql2 (~> 0.2.0)
paperclip (~> 2.7.0)
rails (~> 2.3.11)
rake
@@ -1,25 +1,31 @@
# SQLite version 3.x
# gem install sqlite3-ruby (not necessary on OS X Leopard)
development:
- adapter: sqlite3
- database: db/development.sqlite3
- pool: 5
- timeout: 5000
+ adapter: mysql2
+ database: ristretto_development
+ pool: 5
+ username:
+ password:
+ host: localhost
# 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: &test
- adapter: sqlite3
- database: db/test.sqlite3
- pool: 5
- timeout: 5000
+ adapter: mysql2
+ database: ristretto_test
+ pool: 5
+ username:
+ password:
+ host: localhost
production:
- adapter: sqlite3
- database: db/production.sqlite3
- pool: 5
- timeout: 5000
+ adapter: mysql2
+ database: ristretto_production
+ pool: 5
+ username:
+ password:
+ host: localhost
cucumber:
<<: *test

0 comments on commit 53d7844

Please sign in to comment.