diff --git a/Gemfile b/Gemfile index ee62ec2e8c..77f7735a2f 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,8 @@ gem 'rails', '3.1.4' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' -gem 'sqlite3' +gem 'pg' +gem 'spree' # Gems used only for assets and not required diff --git a/config/database.yml b/config/database.yml index 51a4dd459d..9633824f0f 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,25 +1,24 @@ -# SQLite version 3.x -# gem install sqlite3 -# -# Ensure the SQLite 3 gem is defined in your Gemfile -# gem 'sqlite3' development: - adapter: sqlite3 - database: db/development.sqlite3 + adapter: postgresql + encoding: unicode + database: open_food_web_dev pool: 5 - timeout: 5000 + username: ofw + password: f00d -# 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 + adapter: postgresql + encoding: unicode + database: open_food_web_test pool: 5 - timeout: 5000 + username: ofw + password: f00d +#not used with heroku production: - adapter: sqlite3 - database: db/production.sqlite3 + adapter: postgresql + encoding: unicode + database: open_food_web_prod pool: 5 - timeout: 5000 + username: ofw + password: f00d \ No newline at end of file