diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-07 00:10:24 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-07 00:10:24 -0500 |
| commit | b2e0b1397596ee8f624ef4de122cc71599d4dc0d (patch) | |
| tree | 6db9542609d2150162441f28c7e3932cad0de1d7 /db/schema.rb | |
| parent | abfb00904d5497c320200f3586fe503820ac651c (diff) | |
| parent | 4f8c33b425b075b80ccb32aec35e98a895f59f9c (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/db/schema.rb b/db/schema.rb index 16789fb..c9c0fa6 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: 20140307023557) do +ActiveRecord::Schema.define(version: 20140307050124) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -61,11 +61,6 @@ ActiveRecord::Schema.define(version: 20140307023557) do t.integer "team_id", null: false end - create_table "matches_users", id: false, force: true do |t| - t.integer "user_id", null: false - t.integer "match_id", null: false - end - create_table "players_tournaments", id: false, force: true do |t| t.integer "player_id", null: false t.integer "tournament_id", null: false @@ -119,6 +114,11 @@ ActiveRecord::Schema.define(version: 20140307023557) do add_index "teams", ["match_id"], name: "index_teams_on_match_id" + create_table "teams_users", id: false, force: true do |t| + t.integer "team_id", null: false + t.integer "user_id", null: false + end + create_table "tournament_options", force: true do |t| t.integer "tournament_id" t.integer "vartype" |