From cee6ee68a16df69dbeadbf0f22108874a9242ab1 Mon Sep 17 00:00:00 2001 From: Matchu Date: Sat, 15 May 2010 13:52:20 -0400 Subject: [PATCH] hook up development database --- Gemfile | 4 ++++ config/database.yml | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 01db6bc1..bb92efe5 100644 --- a/Gemfile +++ b/Gemfile @@ -8,6 +8,10 @@ gem 'sqlite3-ruby', :require => 'sqlite3' gem 'haml', '>= 3.0.0' +group :development do + gem 'mysql' +end + group :test do gem 'rspec-rails', '>= 2.0.0.beta.8' gem 'factory_girl', :git => 'git://github.com/thoughtbot/factory_girl.git', :branch => 'rails3' diff --git a/config/database.yml b/config/database.yml index 025d62a8..1dd896f5 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,10 +1,9 @@ -# SQLite version 3.x -# gem install sqlite3-ruby (not necessary on OS X Leopard) development: - adapter: sqlite3 - database: db/development.sqlite3 + adapter: mysql + encoding: utf8 + database: wearables pool: 5 - timeout: 5000 + username: wearables # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake".