From f9a4ee4e998f5f113565a93802c041108e9a180d Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Wed, 2 Apr 2014 14:53:10 -0400 Subject: now ran generate without ger --- db/schema.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'db/schema.rb') diff --git a/db/schema.rb b/db/schema.rb index c3be661..846d2e6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140401215809) do +ActiveRecord::Schema.define(version: 20140402152924) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -90,7 +90,7 @@ ActiveRecord::Schema.define(version: 20140401215809) do create_table "remote_usernames", force: true do |t| t.integer "game_id" t.integer "user_id" - t.text "json_value" + t.string "user_name" t.datetime "created_at" t.datetime "updated_at" end @@ -155,6 +155,11 @@ ActiveRecord::Schema.define(version: 20140401215809) do t.string "name" t.integer "game_id" t.integer "status" + t.integer "min_players_per_team" + t.integer "max_players_per_team" + t.integer "min_teams_per_match" + t.integer "max_teams_per_match" + t.integer "set_rounds" t.boolean "randomized_teams" t.datetime "created_at" t.datetime "updated_at" -- cgit v1.2.3-2-g168b From ef22599880973aae8464bacb82e3a04d6277bc43 Mon Sep 17 00:00:00 2001 From: shumakl Date: Thu, 3 Apr 2014 11:19:10 -0400 Subject: Move things around between users and sessions --- db/schema.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'db/schema.rb') diff --git a/db/schema.rb b/db/schema.rb index 846d2e6..3a87bad 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140402152924) do +ActiveRecord::Schema.define(version: 20140403151832) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -121,10 +121,12 @@ ActiveRecord::Schema.define(version: 20140402152924) do create_table "sessions", force: true do |t| t.integer "user_id" + t.string "token" t.datetime "created_at" t.datetime "updated_at" end + add_index "sessions", ["token"], name: "index_sessions_on_token", unique: true add_index "sessions", ["user_id"], name: "index_sessions_on_user_id" create_table "teams", force: true do |t| @@ -174,12 +176,10 @@ ActiveRecord::Schema.define(version: 20140402152924) do t.datetime "created_at" t.datetime "updated_at" t.string "password_digest" - t.string "remember_token" - t.integer "groups" + t.integer "permissions" end add_index "users", ["email"], name: "index_users_on_email", unique: true - add_index "users", ["remember_token"], name: "index_users_on_remember_token", unique: true add_index "users", ["user_name"], name: "index_users_on_user_name", unique: true end -- cgit v1.2.3-2-g168b From 8e3e46b7951120f1ec34949d607a7672ad03f820 Mon Sep 17 00:00:00 2001 From: shumakl Date: Thu, 3 Apr 2014 11:52:05 -0400 Subject: run generate.sh --- db/schema.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'db/schema.rb') diff --git a/db/schema.rb b/db/schema.rb index 3a87bad..113f16d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140403151832) do +ActiveRecord::Schema.define(version: 20140403155049) do create_table "alerts", force: true do |t| t.integer "author_id" -- cgit v1.2.3-2-g168b