Fixed some merge errors in show.html.erb

22 files changed, 53 insertions, 61 deletions

diff --git a/db/migrate/20140307004031_create_user_team_pairs.rb b/db/migrate/20140307004031_create_user_team_pairs.rb
deleted file mode 100644
index 2c492ac..0000000
--- a/db/migrate/20140307004031_create_user_team_pairs.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class CreateUserTeamPairs < ActiveRecord::Migration
-  def change
-    create_table :user_team_pairs do |t|
-      t.references :user, index: true
-      t.references :team, index: true
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20140307004036_create_user_tournament_pairs.rb b/db/migrate/20140307004036_create_user_tournament_pairs.rb
deleted file mode 100644
index 9885b20..0000000
--- a/db/migrate/20140307004036_create_user_tournament_pairs.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class CreateUserTournamentPairs < ActiveRecord::Migration
-  def change
-    create_table :user_tournament_pairs do |t|
-      t.references :user, index: true
-      t.references :tournament, index: true
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20140307004041_create_team_match_pairs.rb b/db/migrate/20140307004041_create_team_match_pairs.rb
deleted file mode 100644
index 8fac07e..0000000
--- a/db/migrate/20140307004041_create_team_match_pairs.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class CreateTeamMatchPairs < ActiveRecord::Migration
-  def change
-    create_table :team_match_pairs do |t|
-      t.references :team, index: true
-      t.references :match, index: true
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20140307003926_create_servers.rb b/db/migrate/20140307023418_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140307003926_create_servers.rb
+++ b/db/migrate/20140307023418_create_servers.rb
diff --git a/db/migrate/20140307003931_create_matches.rb b/db/migrate/20140307023423_create_matches.rb
index 325863d..325863d 100644
--- a/db/migrate/20140307003931_create_matches.rb
+++ b/db/migrate/20140307023423_create_matches.rb
diff --git a/db/migrate/20140307003703_create_teams.rb b/db/migrate/20140307023428_create_teams.rb
index fdf9a68..fdf9a68 100644
--- a/db/migrate/20140307003703_create_teams.rb
+++ b/db/migrate/20140307023428_create_teams.rb
diff --git a/db/migrate/20140307003709_create_alerts.rb b/db/migrate/20140307023433_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140307003709_create_alerts.rb
+++ b/db/migrate/20140307023433_create_alerts.rb
diff --git a/db/migrate/20140307003714_create_pms.rb b/db/migrate/20140307023438_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140307003714_create_pms.rb
+++ b/db/migrate/20140307023438_create_pms.rb
diff --git a/db/migrate/20140307003719_create_tournaments.rb b/db/migrate/20140307023443_create_tournaments.rb
index 545e603..545e603 100644
--- a/db/migrate/20140307003719_create_tournaments.rb
+++ b/db/migrate/20140307023443_create_tournaments.rb
diff --git a/db/migrate/20140307003956_create_games.rb b/db/migrate/20140307023448_create_games.rb
index 5e4f56f..5e4f56f 100644
--- a/db/migrate/20140307003956_create_games.rb
+++ b/db/migrate/20140307023448_create_games.rb
diff --git a/db/migrate/20140307004001_create_users.rb b/db/migrate/20140307023453_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140307004001_create_users.rb
+++ b/db/migrate/20140307023453_create_users.rb
diff --git a/db/migrate/20140307004006_create_sessions.rb b/db/migrate/20140307023459_create_sessions.rb
index fe25bf2..fe25bf2 100644
--- a/db/migrate/20140307004006_create_sessions.rb
+++ b/db/migrate/20140307023459_create_sessions.rb
diff --git a/db/migrate/20140307004011_create_server_settings.rb b/db/migrate/20140307023504_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140307004011_create_server_settings.rb
+++ b/db/migrate/20140307023504_create_server_settings.rb
diff --git a/db/migrate/20140307004016_create_tournament_options.rb b/db/migrate/20140307023509_create_tournament_options.rb
index 53b601c..53b601c 100644
--- a/db/migrate/20140307004016_create_tournament_options.rb
+++ b/db/migrate/20140307023509_create_tournament_options.rb
diff --git a/db/migrate/20140307004021_create_game_options.rb b/db/migrate/20140307023514_create_game_options.rb
index 2f62ef7..2f62ef7 100644
--- a/db/migrate/20140307004021_create_game_options.rb
+++ b/db/migrate/20140307023514_create_game_options.rb
diff --git a/db/migrate/20140307004027_create_scores.rb b/db/migrate/20140307023519_create_scores.rb
index 4ca0b0b..4ca0b0b 100644
--- a/db/migrate/20140307004027_create_scores.rb
+++ b/db/migrate/20140307023519_create_scores.rb
diff --git a/db/migrate/20140307023524_create_tournament_players_join_table.rb b/db/migrate/20140307023524_create_tournament_players_join_table.rb
new file mode 100644
index 0000000..be240e8
--- /dev/null
+++ b/db/migrate/20140307023524_create_tournament_players_join_table.rb
@@ -0,0 +1,8 @@
+class CreateTournamentPlayersJoinTable < ActiveRecord::Migration
+  def change
+    create_join_table :players, :tournaments do |t|
+      # t.index [:player_id, :tournament_id]
+      # t.index [:tournament_id, :player_id]
+    end
+  end
+end
diff --git a/db/migrate/20140307023529_create_tournament_hosts_join_table.rb b/db/migrate/20140307023529_create_tournament_hosts_join_table.rb
new file mode 100644
index 0000000..7521d89
--- /dev/null
+++ b/db/migrate/20140307023529_create_tournament_hosts_join_table.rb
@@ -0,0 +1,8 @@
+class CreateTournamentHostsJoinTable < ActiveRecord::Migration
+  def change
+    create_join_table :hosts, :tournaments do |t|
+      # t.index [:host_id, :tournament_id]
+      # t.index [:tournament_id, :host_id]
+    end
+  end
+end
diff --git a/db/migrate/20140307023534_create_user_team_join_table.rb b/db/migrate/20140307023534_create_user_team_join_table.rb
new file mode 100644
index 0000000..7b4d17f
--- /dev/null
+++ b/db/migrate/20140307023534_create_user_team_join_table.rb
@@ -0,0 +1,8 @@
+class CreateUserTeamJoinTable < ActiveRecord::Migration
+  def change
+    create_join_table :users, :matches do |t|
+      # t.index [:user_id, :match_id]
+      # t.index [:match_id, :user_id]
+    end
+  end
+end
diff --git a/db/migrate/20140307023538_create_match_team_join_table.rb b/db/migrate/20140307023538_create_match_team_join_table.rb
new file mode 100644
index 0000000..c2ed1b7
--- /dev/null
+++ b/db/migrate/20140307023538_create_match_team_join_table.rb
@@ -0,0 +1,8 @@
+class CreateMatchTeamJoinTable < ActiveRecord::Migration
+  def change
+    create_join_table :matches, :teams do |t|
+      # t.index [:match_id, :team_id]
+      # t.index [:team_id, :match_id]
+    end
+  end
+end
diff --git a/db/migrate/20140307004100_add_hidden_attrs_to_user.rb b/db/migrate/20140307023557_add_hidden_attrs_to_user.rb
index 2f1b0b2..2f1b0b2 100644
--- a/db/migrate/20140307004100_add_hidden_attrs_to_user.rb
+++ b/db/migrate/20140307023557_add_hidden_attrs_to_user.rb
diff --git a/db/schema.rb b/db/schema.rb
index cae1815..16789fb 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: 20140307004100) do
+ActiveRecord::Schema.define(version: 20140307023557) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -42,6 +42,11 @@ ActiveRecord::Schema.define(version: 20140307004100) do
     t.datetime "updated_at"
   end
 
+  create_table "hosts_tournaments", id: false, force: true do |t|
+    t.integer "host_id",       null: false
+    t.integer "tournament_id", null: false
+  end
+
   create_table "matches", force: true do |t|
     t.integer  "tournament_id"
     t.string   "name"
@@ -51,6 +56,21 @@ ActiveRecord::Schema.define(version: 20140307004100) do
 
   add_index "matches", ["tournament_id"], name: "index_matches_on_tournament_id"
 
+  create_table "matches_teams", id: false, force: true do |t|
+    t.integer "match_id", null: false
+    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
+  end
+
   create_table "pms", force: true do |t|
     t.integer  "author_id"
     t.integer  "recipient_id"
@@ -91,16 +111,6 @@ ActiveRecord::Schema.define(version: 20140307004100) do
 
   add_index "sessions", ["user_id"], name: "index_sessions_on_user_id"
 
-  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.integer  "match_id"
     t.datetime "created_at"
@@ -135,26 +145,6 @@ ActiveRecord::Schema.define(version: 20140307004100) do
 
   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 "user_tournament_pairs", force: true do |t|
-    t.integer  "user_id"
-    t.integer  "tournament_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "user_tournament_pairs", ["tournament_id"], name: "index_user_tournament_pairs_on_tournament_id"
-  add_index "user_tournament_pairs", ["user_id"], name: "index_user_tournament_pairs_on_user_id"
-
   create_table "users", force: true do |t|
     t.string   "name"
     t.string   "email"