Skip to content

Commit

Permalink
removed sqlite3
Browse files Browse the repository at this point in the history
  • Loading branch information
aastudent committed Aug 8, 2014
1 parent 015bc06 commit 932a920
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 23 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ gem 'jquery-ui-rails'
gem 'jbuilder', '~> 1.2'
gem 'rails', '4.0.2'
gem 'sass-rails', '~> 4.0.0'
gem 'sqlite3'
gem 'uglifier', '>= 1.3.0'
gem 'pg'

group :doc do
gem 'sdoc', require: false
Expand Down
2 changes: 2 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ GEM
mime-types (1.25.1)
minitest (4.7.5)
multi_json (1.10.1)
pg (0.17.1)
polyglot (0.3.5)
pry (0.10.0)
coderay (~> 1.1.0)
Expand Down Expand Up @@ -171,6 +172,7 @@ DEPENDENCIES
jbuilder (~> 1.2)
jquery-rails
jquery-ui-rails
pg
pry-rails
rails (= 4.0.2)
sass-rails (~> 4.0.0)
Expand Down
16 changes: 2 additions & 14 deletions config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,10 @@
# Ensure the SQLite 3 gem is defined in your Gemfile
# gem 'sqlite3'
development:
adapter: sqlite3
database: db/development.sqlite3
adapter: postgresql
database: product_development
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
19 changes: 11 additions & 8 deletions db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,17 @@

ActiveRecord::Schema.define(version: 20140716203208) do

# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"

create_table "board_memberships", force: true do |t|
t.integer "user_id", null: false
t.integer "board_id", null: false
t.datetime "created_at"
t.datetime "updated_at"
end

add_index "board_memberships", ["user_id", "board_id"], name: "index_board_memberships_on_user_id_and_board_id", unique: true
add_index "board_memberships", ["user_id", "board_id"], name: "index_board_memberships_on_user_id_and_board_id", unique: true, using: :btree

create_table "boards", force: true do |t|
t.string "title", null: false
Expand All @@ -29,7 +32,7 @@
t.datetime "updated_at"
end

add_index "boards", ["user_id"], name: "index_boards_on_user_id"
add_index "boards", ["user_id"], name: "index_boards_on_user_id", using: :btree

create_table "card_assignments", force: true do |t|
t.integer "card_id", null: false
Expand All @@ -38,7 +41,7 @@
t.datetime "updated_at"
end

add_index "card_assignments", ["card_id", "user_id"], name: "index_card_assignments_on_card_id_and_user_id", unique: true
add_index "card_assignments", ["card_id", "user_id"], name: "index_card_assignments_on_card_id_and_user_id", unique: true, using: :btree

create_table "cards", force: true do |t|
t.string "title", null: false
Expand All @@ -49,7 +52,7 @@
t.datetime "updated_at"
end

add_index "cards", ["list_id"], name: "index_cards_on_list_id"
add_index "cards", ["list_id"], name: "index_cards_on_list_id", using: :btree

create_table "items", force: true do |t|
t.string "title", null: false
Expand All @@ -59,7 +62,7 @@
t.datetime "updated_at"
end

add_index "items", ["card_id"], name: "index_items_on_card_id"
add_index "items", ["card_id"], name: "index_items_on_card_id", using: :btree

create_table "lists", force: true do |t|
t.string "title", null: false
Expand All @@ -69,7 +72,7 @@
t.datetime "updated_at"
end

add_index "lists", ["board_id"], name: "index_lists_on_board_id"
add_index "lists", ["board_id"], name: "index_lists_on_board_id", using: :btree

create_table "users", force: true do |t|
t.string "email", null: false
Expand All @@ -79,7 +82,7 @@
t.datetime "updated_at"
end

add_index "users", ["email"], name: "index_users_on_email"
add_index "users", ["session_token"], name: "index_users_on_session_token"
add_index "users", ["email"], name: "index_users_on_email", using: :btree
add_index "users", ["session_token"], name: "index_users_on_session_token", using: :btree

end

0 comments on commit 932a920

Please sign in to comment.