diff --git a/Gemfile b/Gemfile index f282253..bb4af23 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,6 @@ gem 'will_paginate' gem 'nokogiri' gem 'unicorn' gem 'devise' -gem 'sqlite3' gem 'activesupport','4.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index 9ee648a..d8c96af 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -170,7 +170,6 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) - sqlite3 (1.3.8) tddium (1.16.2) highline json @@ -230,7 +229,6 @@ DEPENDENCIES selenium-webdriver simplecov slim - sqlite3 tddium thin unicorn diff --git a/config/database.yml b/config/database.yml index 40040a8..60a13ea 100644 --- a/config/database.yml +++ b/config/database.yml @@ -13,7 +13,7 @@ # gem 'pg' # development: - adapter: sqlite3 + adapter: postgresql encoding: unicode database: libr_development pool: 5 @@ -40,7 +40,7 @@ development: # 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 + adapter: postgresql encoding: unicode database: libr_test pool: 5 diff --git a/db/schema.rb b/db/schema.rb index 4848d8a..2c31243 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -13,6 +13,9 @@ ActiveRecord::Schema.define(version: 20140117135051) do + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + create_table "auth_keys", force: true do |t| t.integer "user_id" t.string "name" @@ -86,7 +89,7 @@ ActiveRecord::Schema.define(version: 20140117135051) do t.string "last_sign_in_ip" end - add_index "users", ["email"], name: "index_users_on_email", unique: true - add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true + add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree + add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree end