From 1b95d76d2bded709f512ccdca851388b8691708f Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Tue, 18 Feb 2014 18:34:50 -0500 Subject: Updated generate and added basic instruction block comment. --- db/schema.rb | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 db/schema.rb (limited to 'db/schema.rb') diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000..1f34ab7 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,41 @@ +# encoding: UTF-8 +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20140304014731) do + + create_table "matches", force: true do |t| + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "servers", force: true do |t| + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "teams", force: true do |t| + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "tournaments", force: true do |t| + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "users", force: true do |t| + t.datetime "created_at" + t.datetime "updated_at" + end + +end -- cgit v1.2.3-2-g168b From 96b97d691f6889004c38bef15411bc27e448fda1 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Tue, 18 Feb 2014 20:42:51 -0500 Subject: Changes to generate.sh --- db/schema.rb | 41 ----------------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 db/schema.rb (limited to 'db/schema.rb') diff --git a/db/schema.rb b/db/schema.rb deleted file mode 100644 index 1f34ab7..0000000 --- a/db/schema.rb +++ /dev/null @@ -1,41 +0,0 @@ -# encoding: UTF-8 -# This file is auto-generated from the current state of the database. Instead -# of editing this file, please use the migrations feature of Active Record to -# incrementally modify your database, and then regenerate this schema definition. -# -# Note that this schema.rb definition is the authoritative source for your -# database schema. If you need to create the application database on another -# system, you should be using db:schema:load, not running all the migrations -# from scratch. The latter is a flawed and unsustainable approach (the more migrations -# you'll amass, the slower it'll run and the greater likelihood for issues). -# -# It's strongly recommended that you check this file into your version control system. - -ActiveRecord::Schema.define(version: 20140304014731) do - - create_table "matches", force: true do |t| - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "servers", force: true do |t| - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "teams", force: true do |t| - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "tournaments", force: true do |t| - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "users", force: true do |t| - t.datetime "created_at" - t.datetime "updated_at" - end - -end -- cgit v1.2.3-2-g168b From cd1fabe40ca4d290df33a2590f3a1f2072103972 Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Thu, 20 Feb 2014 17:13:51 -0500 Subject: fix datatype names in generate.sh --- db/schema.rb | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 db/schema.rb (limited to 'db/schema.rb') diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000..88dfa1a --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,92 @@ +# encoding: UTF-8 +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20140304014857) do + + create_table "alerts", force: true do |t| + t.integer "author_id" + t.text "message" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "alerts", ["author_id"], name: "index_alerts_on_author_id" + + create_table "matches", force: true do |t| + t.integer "tournament_id" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "matches", ["tournament_id"], name: "index_matches_on_tournament_id" + + create_table "pms", force: true do |t| + t.integer "author_id" + t.integer "recipient_id" + t.text "message" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "pms", ["author_id"], name: "index_pms_on_author_id" + add_index "pms", ["recipient_id"], name: "index_pms_on_recipient_id" + + create_table "server_settings", force: true do |t| + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "servers", force: true do |t| + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "team_match_pairs", force: true do |t| + t.integer "team_id" + t.integer "match_id" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "team_match_pairs", ["match_id"], name: "index_team_match_pairs_on_match_id" + add_index "team_match_pairs", ["team_id"], name: "index_team_match_pairs_on_team_id" + + create_table "teams", force: true do |t| + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "tournaments", force: true do |t| + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "user_team_pairs", force: true do |t| + t.integer "user_id" + t.integer "team_id" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "user_team_pairs", ["team_id"], name: "index_user_team_pairs_on_team_id" + add_index "user_team_pairs", ["user_id"], name: "index_user_team_pairs_on_user_id" + + create_table "users", force: true do |t| + t.text "name" + t.text "pw_hash" + t.integer "groups" + t.datetime "created_at" + t.datetime "updated_at" + end + +end -- cgit v1.2.3-2-g168b From 8e3e88f52c1f2d73acdcb7fdf60326b5f7717068 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Wed, 26 Feb 2014 20:07:42 -0500 Subject: Possibly broke everything. Added another model for populating tournament options. --- db/schema.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'db/schema.rb') diff --git a/db/schema.rb b/db/schema.rb index 88dfa1a..9d307ae 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: 20140304014857) do +ActiveRecord::Schema.define(version: 20140304015005) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -66,6 +66,11 @@ ActiveRecord::Schema.define(version: 20140304014857) do t.datetime "updated_at" end + create_table "tournament_options", force: true do |t| + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "tournaments", force: true do |t| t.datetime "created_at" t.datetime "updated_at" -- cgit v1.2.3-2-g168b From 3a7b14f4a51c0fdb8b71720f361a0a8ccf080325 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 27 Feb 2014 16:59:04 -0500 Subject: add game types --- db/schema.rb | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'db/schema.rb') diff --git a/db/schema.rb b/db/schema.rb index 9d307ae..86afd1b 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: 20140304015005) do +ActiveRecord::Schema.define(version: 20140304015042) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -22,6 +22,22 @@ ActiveRecord::Schema.define(version: 20140304015005) do add_index "alerts", ["author_id"], name: "index_alerts_on_author_id" + create_table "game_attributes", force: true do |t| + t.integer "game_id" + t.text "key" + t.integer "type" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "game_attributes", ["game_id"], name: "index_game_attributes_on_game_id" + + create_table "games", force: true do |t| + t.text "name" + t.datetime "created_at" + t.datetime "updated_at" + end + create_table "matches", force: true do |t| t.integer "tournament_id" t.datetime "created_at" -- cgit v1.2.3-2-g168b From de40ec53e8b80d8d880214183f19ea93172a0026 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 27 Feb 2014 17:02:10 -0500 Subject: give tournaments a game type --- db/schema.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'db/schema.rb') diff --git a/db/schema.rb b/db/schema.rb index 86afd1b..7681cfc 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: 20140304015042) do +ActiveRecord::Schema.define(version: 20140304015120) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -88,10 +88,13 @@ ActiveRecord::Schema.define(version: 20140304015042) do end create_table "tournaments", force: true do |t| + t.integer "game_id" t.datetime "created_at" t.datetime "updated_at" end + add_index "tournaments", ["game_id"], name: "index_tournaments_on_game_id" + create_table "user_team_pairs", force: true do |t| t.integer "user_id" t.integer "team_id" -- cgit v1.2.3-2-g168b From f3f17dcd9755020276062caae7c0677eff88cb2f Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Thu, 27 Feb 2014 17:41:59 -0500 Subject: Added the Games Attributes stuff. --- db/schema.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'db/schema.rb') diff --git a/db/schema.rb b/db/schema.rb index 7681cfc..42417f4 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: 20140304015120) do +ActiveRecord::Schema.define(version: 20140304015158) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -34,6 +34,10 @@ ActiveRecord::Schema.define(version: 20140304015120) do create_table "games", force: true do |t| t.text "name" + t.integer "players_per_team" + t.integer "teams_per_match" + t.integer "set_rounds" + t.integer "randomized_teams" t.datetime "created_at" t.datetime "updated_at" end -- cgit v1.2.3-2-g168b From 068e95231c3d2cee113cf77af67ce785d853429e Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Thu, 27 Feb 2014 17:44:37 -0500 Subject: Added the seeding to generation. --- 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 42417f4..ede0e8c 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: 20140304015158) do +ActiveRecord::Schema.define(version: 20140304015236) do create_table "alerts", force: true do |t| t.integer "author_id" -- cgit v1.2.3-2-g168b From 6e20d92989739bde287c6a07c03ae3f70755660b Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Thu, 27 Feb 2014 17:56:31 -0500 Subject: Booted the strap --- 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 88dfa1a..5d839f4 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: 20140304014857) do +ActiveRecord::Schema.define(version: 20140304014928) do create_table "alerts", force: true do |t| t.integer "author_id" -- cgit v1.2.3-2-g168b From e73f2a30699cc7ce9c7959ede513aec8c3942586 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Sat, 1 Mar 2014 19:56:04 -0500 Subject: I added a start.sh file so that you can just type ./start.sh to both generate and start the server. --- 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 264a347..445f943 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: 20140304015316) do +ActiveRecord::Schema.define(version: 20140304015357) do create_table "alerts", force: true do |t| t.integer "author_id" -- cgit v1.2.3-2-g168b From ae3b9a846a1a08865bc8fe2f38a24bbb01e8622c Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Sat, 1 Mar 2014 19:59:36 -0500 Subject: Made the start script sent 2> to a file called server.talk for later reference. --- 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 445f943..f970bd1 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: 20140304015357) do +ActiveRecord::Schema.define(version: 20140304015437) do create_table "alerts", force: true do |t| t.integer "author_id" -- cgit v1.2.3-2-g168b From 2eb242f3e5b1f1ab66d84556cabcad965fe387aa Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Sat, 1 Mar 2014 20:23:29 -0500 Subject: changed the user section of the generate --- 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 41dac9e..7d4d50e 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: 20140304015517) do +ActiveRecord::Schema.define(version: 20140304015559) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -110,9 +110,9 @@ ActiveRecord::Schema.define(version: 20140304015517) do add_index "user_team_pairs", ["user_id"], name: "index_user_team_pairs_on_user_id" create_table "users", force: true do |t| - t.text "name" - t.text "pw_hash" - t.integer "groups" + t.string "name" + t.string "email" + t.string "user_name" t.datetime "created_at" t.datetime "updated_at" end -- cgit v1.2.3-2-g168b From 11be92e4bac671852fd03922049ca592ae4c9f4e Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Sat, 1 Mar 2014 20:24:43 -0500 Subject: changed the gemfile to include rspecy testing and a security name i cant remember the name of --- 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 7d4d50e..d44352e 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: 20140304015559) do +ActiveRecord::Schema.define(version: 20140304015644) do create_table "alerts", force: true do |t| t.integer "author_id" -- cgit v1.2.3-2-g168b From 4dcb9de406dd032ecb37109402c4475d96d2a05a Mon Sep 17 00:00:00 2001 From: Tomer Kimia Date: Sat, 1 Mar 2014 22:53:08 -0500 Subject: quick and dirty css --- 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 d44352e..ae688b1 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: 20140304015644) do +ActiveRecord::Schema.define(version: 20140304015813) do create_table "alerts", force: true do |t| t.integer "author_id" -- cgit v1.2.3-2-g168b From faa08e4f2dbc6fb37619df7375638c1a7749ef80 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 1 Mar 2014 23:18:45 -0500 Subject: mv docs doc --- 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 d44352e..2ffb746 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: 20140304015644) do +ActiveRecord::Schema.define(version: 20140304015944) do create_table "alerts", force: true do |t| t.integer "author_id" -- cgit v1.2.3-2-g168b From 65289cfb93599cdad1f3476f2f8728e5b0752779 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 1 Mar 2014 23:20:08 -0500 Subject: doc/.gitignore: ignore generated documentation --- 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 2ffb746..196a341 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: 20140304015944) do +ActiveRecord::Schema.define(version: 20140304020029) do create_table "alerts", force: true do |t| t.integer "author_id" -- cgit v1.2.3-2-g168b From fbe54253ea8c31796a16d0fb90b7d3b5be717b1c Mon Sep 17 00:00:00 2001 From: Tomer Kimia Date: Sun, 2 Mar 2014 11:11:04 -0500 Subject: added preliminary homepage --- 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 ae688b1..4e1da7f 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: 20140304015813) do +ActiveRecord::Schema.define(version: 20140304015859) do create_table "alerts", force: true do |t| t.integer "author_id" -- cgit v1.2.3-2-g168b From 4e682a9a8596326a2d1faab6c44e5a54918c5ba0 Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Sun, 2 Mar 2014 15:04:26 -0500 Subject: Gemfile.lock --- 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 d44352e..4a44343 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: 20140304015644) do +ActiveRecord::Schema.define(version: 20140304015729) do create_table "alerts", force: true do |t| t.integer "author_id" -- cgit v1.2.3-2-g168b From eaf3d3cddf418c560c9619f722ea1dbc5d6cc61a Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Sun, 2 Mar 2014 15:59:50 -0500 Subject: currently adding Session controller and view --- db/schema.rb | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100644 db/schema.rb (limited to 'db/schema.rb') diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000..016476d --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,120 @@ +# encoding: UTF-8 +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20140304020255) do + + create_table "alerts", force: true do |t| + t.integer "author_id" + t.text "message" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "alerts", ["author_id"], name: "index_alerts_on_author_id" + + create_table "game_attributes", force: true do |t| + t.integer "game_id" + t.text "key" + t.integer "type" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "game_attributes", ["game_id"], name: "index_game_attributes_on_game_id" + + create_table "games", force: true do |t| + t.text "name" + t.integer "players_per_team" + t.integer "teams_per_match" + t.integer "set_rounds" + t.integer "randomized_teams" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "matches", force: true do |t| + t.integer "tournament_id" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "matches", ["tournament_id"], name: "index_matches_on_tournament_id" + + create_table "pms", force: true do |t| + t.integer "author_id" + t.integer "recipient_id" + t.text "message" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "pms", ["author_id"], name: "index_pms_on_author_id" + add_index "pms", ["recipient_id"], name: "index_pms_on_recipient_id" + + create_table "server_settings", force: true do |t| + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "servers", force: true do |t| + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "team_match_pairs", force: true do |t| + t.integer "team_id" + t.integer "match_id" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "team_match_pairs", ["match_id"], name: "index_team_match_pairs_on_match_id" + add_index "team_match_pairs", ["team_id"], name: "index_team_match_pairs_on_team_id" + + create_table "teams", force: true do |t| + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "tournament_options", force: true do |t| + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "tournaments", force: true do |t| + t.integer "game_id" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "tournaments", ["game_id"], name: "index_tournaments_on_game_id" + + create_table "user_team_pairs", force: true do |t| + t.integer "user_id" + t.integer "team_id" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "user_team_pairs", ["team_id"], name: "index_user_team_pairs_on_team_id" + add_index "user_team_pairs", ["user_id"], name: "index_user_team_pairs_on_user_id" + + create_table "users", force: true do |t| + t.string "name" + t.string "email" + t.string "user_name" + t.datetime "created_at" + t.datetime "updated_at" + end + +end -- cgit v1.2.3-2-g168b From fd059f33294c86bc5a9fcd718461de992786a223 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Sun, 2 Mar 2014 18:41:22 -0500 Subject: The start script is less obnoxious now. --- 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 dc34863..87bf66d 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: 20140304020432) do +ActiveRecord::Schema.define(version: 20140304020521) do create_table "alerts", force: true do |t| t.integer "author_id" -- cgit v1.2.3-2-g168b From c7469584f3fa51666d5df074d012741cbb2f3663 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Sun, 2 Mar 2014 19:10:29 -0500 Subject: Added --force flags for parts of the generator. --- 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 87bf66d..847a686 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: 20140304020521) do +ActiveRecord::Schema.define(version: 20140304020609) do create_table "alerts", force: true do |t| t.integer "author_id" -- cgit v1.2.3-2-g168b From fefe3f469243d6c932c256cc8798bae35e4ff1c4 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Sun, 2 Mar 2014 21:10:49 -0500 Subject: Added Tournament Name. --- db/schema.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'db/schema.rb') diff --git a/db/schema.rb b/db/schema.rb index 847a686..9069230 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: 20140304020609) do +ActiveRecord::Schema.define(version: 20140304020747) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -44,6 +44,7 @@ ActiveRecord::Schema.define(version: 20140304020609) do create_table "matches", force: true do |t| t.integer "tournament_id" + t.string "name" t.datetime "created_at" t.datetime "updated_at" end -- cgit v1.2.3-2-g168b From ec0ee835e8671fc5a421b7e7bcb54d4eec6deedb Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Sun, 2 Mar 2014 21:14:29 -0500 Subject: changed the 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 847a686..4e4d940 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: 20140304020609) do +ActiveRecord::Schema.define(version: 20140304020658) do create_table "alerts", force: true do |t| t.integer "author_id" -- cgit v1.2.3-2-g168b From b21c833a0974b79585d94e2afa4db980a5061123 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Sun, 2 Mar 2014 22:12:58 -0500 Subject: Merge branch 'master' of http://github.com/LukeShu/leaguer --- 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 5e2024b..f4bff97 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: 20140304020835) do +ActiveRecord::Schema.define(version: 20140304020924) do create_table "alerts", force: true do |t| t.integer "author_id" -- cgit v1.2.3-2-g168b From b59aa7c21ae04a399639209717b980d731c5bf13 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Mon, 3 Mar 2014 11:40:05 -0500 Subject: Some of the stuff I forgot to commit last night. Updated and cleaned up some pages as well as getting the gameType listing to work. --- 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 f4bff97..123736f 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: 20140304020924) do +ActiveRecord::Schema.define(version: 20140304021012) do create_table "alerts", force: true do |t| t.integer "author_id" -- cgit v1.2.3-2-g168b From da4724adddc136b9a50123b8b019d15b95e8931e Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Mon, 3 Mar 2014 14:09:32 -0500 Subject: Made it possible to log in from the sign up page. As in I put a link under the mess I made. --- 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 a2c1dc9..cfd889c 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: 20140304021101) do +ActiveRecord::Schema.define(version: 20140304021150) do create_table "alerts", force: true do |t| t.integer "author_id" -- cgit v1.2.3-2-g168b From 423d0e5a440d8d66407522bc842ef273196173bc Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 3 Mar 2014 22:20:02 -0500 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 e40d70c..a9bd57b 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: 20140304021327) do +ActiveRecord::Schema.define(version: 20140304031834) do create_table "alerts", force: true do |t| t.integer "author_id" -- cgit v1.2.3-2-g168b From 223a60e2f014b76ad3482bf9cc7e3500d59e403a Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 3 Mar 2014 23:21:30 -0500 Subject: Have generate.sh to tricky git stuff, run it also, stick in a couple of missing 'bundle exec's --- 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 a9bd57b..eb44d71 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: 20140304031834) do +ActiveRecord::Schema.define(version: 20140304041720) do create_table "alerts", force: true do |t| t.integer "author_id" -- cgit v1.2.3-2-g168b From 11e4de6fd8235b1877b1725d53a98f017130c768 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 3 Mar 2014 23:38:57 -0500 Subject: fix index-adding migrations (I think), and fix `git add`ing schema.rb --- 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 eb44d71..1f844f5 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: 20140304041720) do +ActiveRecord::Schema.define(version: 20140304043700) do create_table "alerts", force: true do |t| t.integer "author_id" -- cgit v1.2.3-2-g168b