Permalink
Browse files

switching to sqlite3

  • Loading branch information...
1 parent d49a360 commit 3a97a53408fc0d82f92e2f5578767f11da0097b4 Jen-Mei Wu committed Feb 25, 2011
Showing with 28 additions and 15 deletions.
  1. +1 −0 .rvmrc
  2. +2 −1 Gemfile
  3. +2 −2 Gemfile.lock
  4. +23 −12 config/database.yml
View
1 .rvmrc
@@ -0,0 +1 @@
+rvm use 1.8.7@traveljournal
View
@@ -5,7 +5,8 @@ gem 'rails', '3.0.4'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
-gem 'mysql2'
+gem 'sqlite3'
+#gem 'mysql2'
# Use unicorn as the web server
# gem 'unicorn'
View
@@ -39,7 +39,6 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
- mysql2 (0.2.6)
polyglot (0.3.1)
rack (1.2.1)
rack-mount (0.6.13)
@@ -60,6 +59,7 @@ GEM
rake (>= 0.8.7)
thor (~> 0.14.4)
rake (0.8.7)
+ sqlite3 (1.3.3)
thor (0.14.6)
treetop (1.4.9)
polyglot (>= 0.3.1)
@@ -69,5 +69,5 @@ PLATFORMS
ruby
DEPENDENCIES
- mysql2
rails (= 3.0.4)
+ sqlite3
View
@@ -1,24 +1,35 @@
# SQLite version 3.x
# gem install sqlite3-ruby (not necessary on OS X Leopard)
development:
- adapter: mysql2
- database: rou
- host: localhost
- username: root
- password:
- pool: 10
+ adapter: sqlite3
+ database: db/development.sqlite3
+ pool: 5
timeout: 5000
+#development:
+ #adapter: sqlite3
+ #database: rou
+ #host: localhost
+ #username: root
+ #password:
+ #pool: 10
+ #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: rou
+ #host: localhost
+ #username: root
+ #password:
+ #pool: 10
+ #timeout: 5000
test:
- adapter: mysql2
- database: rou
- host: localhost
- username: root
- password:
- pool: 10
+ adapter: sqlite3
+ database: db/test.sqlite3
+ pool: 5
timeout: 5000
production:

0 comments on commit 3a97a53

Please sign in to comment.