diff --git a/Gemfile b/Gemfile index 86144a2..55cfd13 100644 --- a/Gemfile +++ b/Gemfile @@ -28,6 +28,10 @@ group :production do gem 'unicorn' end +group :development do + gem 'sqlite3' +end + # To use ActiveModel has_secure_password # gem 'bcrypt-ruby', '~> 3.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index 44c0403..6268e86 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -59,7 +59,7 @@ GEM i18n (0.6.1) journey (1.0.4) json (1.7.6) - kgio (2.7.4) + kgio (2.8.0) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) @@ -105,6 +105,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + sqlite3 (1.3.7) thor (0.16.0) tilt (1.3.3) treetop (1.4.12) @@ -135,5 +136,6 @@ DEPENDENCIES mysql2 rails (= 3.2.11) sass-rails (~> 3.2.3) + sqlite3 uglifier (>= 1.0.3) unicorn diff --git a/config/database.yml b/config/database.yml index 3b395ff..2004b66 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,20 +1,19 @@ +# SQLite version 3.x +# gem install sqlite:w3 development: - adapter: mysql2 - database: forum/dev - host: localhost - username: forum - password: forum + adapter: sqlite3 + database: db/development.sqlite3 + pool: 5 + timeout: 5000 # 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: mysql2 - database: forum/test - host: localhost - username: forum - password: forum - + adapter: sqlite3 + database: db/test.sqlite3 + pool: 5 + timeout: 5000 production: adapter: mysql2 database: forum