dice/impress
1
0
Fork 0
forked from OpenNeo/impress
Code Pull requests Activity

hook up development database

Browse source
This commit is contained in:
Emi Matchu 2010-05-15 13:52:20 -04:00
parent 4d4ded3c11
commit cee6ee68a1
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -8,6 +8,10 @@ gem 'sqlite3-ruby', :require => 'sqlite3'
gem 'haml', '>= 3.0.0' gem 'haml', '>= 3.0.0'
group :development do
gem 'mysql'
end
group :test do group :test do
gem 'rspec-rails', '>= 2.0.0.beta.8' gem 'rspec-rails', '>= 2.0.0.beta.8'
gem 'factory_girl', :git => 'git://github.com/thoughtbot/factory_girl.git', :branch => 'rails3' gem 'factory_girl', :git => 'git://github.com/thoughtbot/factory_girl.git', :branch => 'rails3'

9
config/database.yml
View file

@ -1,10 +1,9 @@
# SQLite version 3.x
# gem install sqlite3-ruby (not necessary on OS X Leopard)
development: development:
adapter: sqlite3 adapter: mysql
database: db/development.sqlite3 encoding: utf8
database: wearables
pool: 5 pool: 5
timeout: 5000 username: wearables
# 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".