diff --git a/Gemfile b/Gemfile index eccdd84..6ea111d 100644 --- a/Gemfile +++ b/Gemfile @@ -2,30 +2,10 @@ source 'http://rubygems.org' gem 'rails', '3.0.4' -# Bundle edge Rails instead: -# gem 'rails', :git => 'git://github.com/rails/rails.git' +group :development do + gem 'pg' +end -gem 'sqlite3' - -# Use unicorn as the web server -# gem 'unicorn' - -# Deploy with Capistrano -# gem 'capistrano' - -# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+) -# gem 'ruby-debug' -# gem 'ruby-debug19' - -# Bundle the extra gems: -# gem 'bj' -# gem 'nokogiri' -# gem 'sqlite3-ruby', :require => 'sqlite3' -# gem 'aws-s3', :require => 'aws/s3' - -# Bundle gems for the local environment. Make sure to -# put test-only gems in this group so their generators -# and rake tasks are available in development mode: -# group :development, :test do -# gem 'webrat' -# end +group :test do + gem 'sqlite3' +end diff --git a/Gemfile.lock b/Gemfile.lock index 776d849..6aae4f7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,6 +39,7 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.16) + pg (0.10.1) polyglot (0.3.1) rack (1.2.1) rack-mount (0.6.13) @@ -69,5 +70,6 @@ PLATFORMS ruby DEPENDENCIES + pg rails (= 3.0.4) sqlite3 diff --git a/config/database.yml b/config/database.yml index 90d87cc..f683259 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,10 +1,8 @@ -# SQLite version 3.x -# gem install sqlite3 development: - adapter: sqlite3 - database: db/development.sqlite3 - pool: 5 - timeout: 5000 + adapter: postgresql + database: adopt-a-hydrant + username: postgres + password: # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake".