Changed development database to sqlite3

This commit is contained in:
2013-01-21 17:30:55 -05:00
parent 40ff30c822
commit b83721ed56
3 changed files with 17 additions and 12 deletions

View File

@@ -28,6 +28,10 @@ group :production do
gem 'unicorn' gem 'unicorn'
end end
group :development do
gem 'sqlite3'
end
# To use ActiveModel has_secure_password # To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0' # gem 'bcrypt-ruby', '~> 3.0.0'

View File

@@ -59,7 +59,7 @@ GEM
i18n (0.6.1) i18n (0.6.1)
journey (1.0.4) journey (1.0.4)
json (1.7.6) json (1.7.6)
kgio (2.7.4) kgio (2.8.0)
mail (2.4.4) mail (2.4.4)
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
@@ -105,6 +105,7 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.7)
thor (0.16.0) thor (0.16.0)
tilt (1.3.3) tilt (1.3.3)
treetop (1.4.12) treetop (1.4.12)
@@ -135,5 +136,6 @@ DEPENDENCIES
mysql2 mysql2
rails (= 3.2.11) rails (= 3.2.11)
sass-rails (~> 3.2.3) sass-rails (~> 3.2.3)
sqlite3
uglifier (>= 1.0.3) uglifier (>= 1.0.3)
unicorn unicorn

View File

@@ -1,20 +1,19 @@
# SQLite version 3.x
# gem install sqlite:w3
development: development:
adapter: mysql2 adapter: sqlite3
database: forum/dev database: db/development.sqlite3
host: localhost pool: 5
username: forum timeout: 5000
password: forum
# 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".
# Do not set this db to the same as development or production. # Do not set this db to the same as development or production.
test: test:
adapter: mysql2 adapter: sqlite3
database: forum/test database: db/test.sqlite3
host: localhost pool: 5
username: forum timeout: 5000
password: forum
production: production:
adapter: mysql2 adapter: mysql2
database: forum database: forum