Browse files

Remove sqlite3 support, us pg in development

  • Loading branch information...
1 parent 09ec88d commit a09ba8f1bdee96ea35bb4d9bc00b9a029d923f51 @nbibler nbibler committed Jun 17, 2011
Showing with 4 additions and 33 deletions.
  1. +3 −1 .gitignore
  2. +1 −6 Gemfile
  3. +0 −4 Gemfile.lock
  4. +0 −22 config/database.yml
View
4 .gitignore
@@ -1,4 +1,6 @@
.bundle
db/*.sqlite3
log/*.log
-tmp/**/*
+tmp/
+
+config/database.yml
View
7 Gemfile
@@ -3,15 +3,10 @@ source 'http://rubygems.org'
gem 'rails', '3.0.5'
gem 'friendly_id', '3.2.1.1'
gem 'rack-response-signature', '0.2.0', :require => 'rack/response_signature'
-
-gem 'sqlite3-ruby', :require => 'sqlite3', :group => [:test, :development]
+gem 'pg'
group :test do
gem 'shoulda'
gem 'mocha'
gem 'factory_girl'
end
-
-group :production do
- gem 'pg'
-end
View
4 Gemfile.lock
@@ -67,9 +67,6 @@ GEM
thor (~> 0.14.4)
rake (0.8.7)
shoulda (2.11.3)
- sqlite3 (1.3.3)
- sqlite3-ruby (1.3.3)
- sqlite3 (>= 1.3.3)
thor (0.14.6)
treetop (1.4.9)
polyglot (>= 0.3.1)
@@ -86,4 +83,3 @@ DEPENDENCIES
rack-response-signature (= 0.2.0)
rails (= 3.0.5)
shoulda
- sqlite3-ruby
View
22 config/database.yml
@@ -1,22 +0,0 @@
-# SQLite version 3.x
-# gem install sqlite3-ruby (not necessary on OS X Leopard)
-development:
- 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: sqlite3
- database: db/test.sqlite3
- pool: 5
- timeout: 5000
-
-production:
- adapter: sqlite3
- database: db/production.sqlite3
- pool: 5
- timeout: 5000

0 comments on commit a09ba8f

Please sign in to comment.