Permalink
Browse files

switching to mysql database

  • Loading branch information...
1 parent 2791d15 commit 25b30f07381f486dec05991ef5efcb3caea97670 @ryanb committed Dec 8, 2010
Showing with 37 additions and 14 deletions.
  1. +2 −1 Gemfile
  2. +7 −2 Gemfile.lock
  3. +28 −11 config/database.example.yml
View
@@ -1,14 +1,15 @@
source 'http://rubygems.org'
gem "rails", "3.0.3"
-gem "sqlite3-ruby", :require => "sqlite3"
+gem "mysql2"
gem "authlogic"
gem "authlogic-oid", :require => "authlogic_openid"
gem "ruby-openid", :require => "openid"
gem "rack-openid", :require => "rack/openid"
gem "paperclip"
gem "rmagick", :require => "RMagick"
gem "jquery-rails"
+gem "whenever", :require => false
group :development, :test do
gem "mocha"
View
@@ -2,6 +2,7 @@ GEM
remote: http://rubygems.org/
specs:
ZenTest (4.4.1)
+ aaronh-chronic (0.3.9)
abstract (1.0.0)
actionmailer (3.0.3)
actionpack (= 3.0.3)
@@ -58,6 +59,7 @@ GEM
mime-types (1.16)
mocha (0.9.10)
rake
+ mysql2 (0.2.6)
nifty-generators (0.4.2)
paperclip (2.3.6)
activerecord
@@ -100,11 +102,13 @@ GEM
railties (~> 3.0)
rspec (~> 2.2.0)
ruby-openid (2.1.8)
- sqlite3-ruby (1.3.2)
thor (0.14.6)
treetop (1.4.9)
polyglot (>= 0.3.1)
tzinfo (0.3.23)
+ whenever (0.6.2)
+ aaronh-chronic (>= 0.3.9)
+ activesupport (>= 2.3.4)
PLATFORMS
ruby
@@ -117,11 +121,12 @@ DEPENDENCIES
factory_girl_rails
jquery-rails
mocha
+ mysql2
nifty-generators
paperclip
rack-openid
rails (= 3.0.3)
rmagick
rspec-rails
ruby-openid
- sqlite3-ruby
+ whenever
@@ -1,22 +1,39 @@
-# SQLite version 3.x
-# gem install sqlite3-ruby (not necessary on OS X Leopard)
+# MySQL. Versions 4.1 and 5.0 are recommended.
+#
+# Install the MySQL driver:
+# gem install mysql2
+#
+# And be sure to use new-style password hashing:
+# http://dev.mysql.com/doc/refman/5.0/en/old-client.html
development:
- adapter: sqlite3
- database: db/development.sqlite3
+ adapter: mysql2
+ encoding: utf8
+ reconnect: false
+ database: dailystamp_development
pool: 5
- timeout: 5000
+ username: root
+ 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: sqlite3
- database: db/test.sqlite3
+ adapter: mysql2
+ encoding: utf8
+ reconnect: false
+ database: dailystamp_test
pool: 5
- timeout: 5000
+ username: root
+ password:
+ socket: /tmp/mysql.sock
production:
- adapter: sqlite3
- database: db/production.sqlite3
+ adapter: mysql2
+ encoding: utf8
+ reconnect: false
+ database: dailystamp_production
pool: 5
- timeout: 5000
+ username: root
+ password:
+ socket: /var/run/mysqld/mysqld.sock

0 comments on commit 25b30f0

Please sign in to comment.