diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 21:30:30 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 21:30:30 -0500 |
commit | 5f8baf6334f427506193ea8efd1356812468e191 (patch) | |
tree | 216b749f9d589739eefa69e02122ed60654a2d9b /db/migrate | |
parent | 7bcd854443e368806cf1f4ece562c157db723d1a (diff) | |
parent | c9f2abad7b9c967e23ed2b2867d426eb27f61387 (diff) |
Merge branch 'clean'
Conflicts:
app/controllers/tournaments_controller.rb
Diffstat (limited to 'db/migrate')
-rw-r--r-- | db/migrate/20140307004031_create_user_team_pairs.rb | 10 | ||||
-rw-r--r-- | db/migrate/20140307004036_create_user_tournament_pairs.rb | 10 | ||||
-rw-r--r-- | db/migrate/20140307004041_create_team_match_pairs.rb | 10 | ||||
-rw-r--r-- | db/migrate/20140307022637_create_servers.rb (renamed from db/migrate/20140307003926_create_servers.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307022643_create_matches.rb (renamed from db/migrate/20140307003931_create_matches.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307022648_create_teams.rb (renamed from db/migrate/20140307003703_create_teams.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307022653_create_alerts.rb (renamed from db/migrate/20140307003709_create_alerts.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307022658_create_pms.rb (renamed from db/migrate/20140307003714_create_pms.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307022704_create_tournaments.rb (renamed from db/migrate/20140307003719_create_tournaments.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307022709_create_games.rb (renamed from db/migrate/20140307003956_create_games.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307022714_create_users.rb (renamed from db/migrate/20140307004001_create_users.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307022719_create_sessions.rb (renamed from db/migrate/20140307004006_create_sessions.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307022725_create_server_settings.rb (renamed from db/migrate/20140307004011_create_server_settings.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307022729_create_tournament_options.rb (renamed from db/migrate/20140307004016_create_tournament_options.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307022734_create_game_options.rb (renamed from db/migrate/20140307004021_create_game_options.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307022740_create_scores.rb (renamed from db/migrate/20140307004027_create_scores.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140307022745_create_tournament_players_join_table.rb | 8 | ||||
-rw-r--r-- | db/migrate/20140307022749_create_tournament_hosts_join_table.rb | 8 | ||||
-rw-r--r-- | db/migrate/20140307022754_create_user_team_join_table.rb | 8 | ||||
-rw-r--r-- | db/migrate/20140307022759_create_match_team_join_table.rb | 8 | ||||
-rw-r--r-- | db/migrate/20140307022818_add_hidden_attrs_to_user.rb (renamed from db/migrate/20140307004100_add_hidden_attrs_to_user.rb) | 0 |
21 files changed, 32 insertions, 30 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/20140307022637_create_servers.rb index f33241a..f33241a 100644 --- a/db/migrate/20140307003926_create_servers.rb +++ b/db/migrate/20140307022637_create_servers.rb diff --git a/db/migrate/20140307003931_create_matches.rb b/db/migrate/20140307022643_create_matches.rb index 325863d..325863d 100644 --- a/db/migrate/20140307003931_create_matches.rb +++ b/db/migrate/20140307022643_create_matches.rb diff --git a/db/migrate/20140307003703_create_teams.rb b/db/migrate/20140307022648_create_teams.rb index fdf9a68..fdf9a68 100644 --- a/db/migrate/20140307003703_create_teams.rb +++ b/db/migrate/20140307022648_create_teams.rb diff --git a/db/migrate/20140307003709_create_alerts.rb b/db/migrate/20140307022653_create_alerts.rb index 68a8e10..68a8e10 100644 --- a/db/migrate/20140307003709_create_alerts.rb +++ b/db/migrate/20140307022653_create_alerts.rb diff --git a/db/migrate/20140307003714_create_pms.rb b/db/migrate/20140307022658_create_pms.rb index 93bb5c6..93bb5c6 100644 --- a/db/migrate/20140307003714_create_pms.rb +++ b/db/migrate/20140307022658_create_pms.rb diff --git a/db/migrate/20140307003719_create_tournaments.rb b/db/migrate/20140307022704_create_tournaments.rb index 545e603..545e603 100644 --- a/db/migrate/20140307003719_create_tournaments.rb +++ b/db/migrate/20140307022704_create_tournaments.rb diff --git a/db/migrate/20140307003956_create_games.rb b/db/migrate/20140307022709_create_games.rb index 5e4f56f..5e4f56f 100644 --- a/db/migrate/20140307003956_create_games.rb +++ b/db/migrate/20140307022709_create_games.rb diff --git a/db/migrate/20140307004001_create_users.rb b/db/migrate/20140307022714_create_users.rb index 8032870..8032870 100644 --- a/db/migrate/20140307004001_create_users.rb +++ b/db/migrate/20140307022714_create_users.rb diff --git a/db/migrate/20140307004006_create_sessions.rb b/db/migrate/20140307022719_create_sessions.rb index fe25bf2..fe25bf2 100644 --- a/db/migrate/20140307004006_create_sessions.rb +++ b/db/migrate/20140307022719_create_sessions.rb diff --git a/db/migrate/20140307004011_create_server_settings.rb b/db/migrate/20140307022725_create_server_settings.rb index dfdd91b..dfdd91b 100644 --- a/db/migrate/20140307004011_create_server_settings.rb +++ b/db/migrate/20140307022725_create_server_settings.rb diff --git a/db/migrate/20140307004016_create_tournament_options.rb b/db/migrate/20140307022729_create_tournament_options.rb index 53b601c..53b601c 100644 --- a/db/migrate/20140307004016_create_tournament_options.rb +++ b/db/migrate/20140307022729_create_tournament_options.rb diff --git a/db/migrate/20140307004021_create_game_options.rb b/db/migrate/20140307022734_create_game_options.rb index 2f62ef7..2f62ef7 100644 --- a/db/migrate/20140307004021_create_game_options.rb +++ b/db/migrate/20140307022734_create_game_options.rb diff --git a/db/migrate/20140307004027_create_scores.rb b/db/migrate/20140307022740_create_scores.rb index 4ca0b0b..4ca0b0b 100644 --- a/db/migrate/20140307004027_create_scores.rb +++ b/db/migrate/20140307022740_create_scores.rb diff --git a/db/migrate/20140307022745_create_tournament_players_join_table.rb b/db/migrate/20140307022745_create_tournament_players_join_table.rb new file mode 100644 index 0000000..9ff8a7a --- /dev/null +++ b/db/migrate/20140307022745_create_tournament_players_join_table.rb @@ -0,0 +1,8 @@ +class CreateTournamentPlayersJoinTable < ActiveRecord::Migration + def change + create_join_table :users, :tournaments do |t| + # t.index [:user_id, :tournament_id] + # t.index [:tournament_id, :user_id] + end + end +end diff --git a/db/migrate/20140307022749_create_tournament_hosts_join_table.rb b/db/migrate/20140307022749_create_tournament_hosts_join_table.rb new file mode 100644 index 0000000..0eff550 --- /dev/null +++ b/db/migrate/20140307022749_create_tournament_hosts_join_table.rb @@ -0,0 +1,8 @@ +class CreateTournamentHostsJoinTable < ActiveRecord::Migration + def change + create_join_table :users, :tournaments do |t| + # t.index [:user_id, :tournament_id] + # t.index [:tournament_id, :user_id] + end + end +end diff --git a/db/migrate/20140307022754_create_user_team_join_table.rb b/db/migrate/20140307022754_create_user_team_join_table.rb new file mode 100644 index 0000000..7b4d17f --- /dev/null +++ b/db/migrate/20140307022754_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/20140307022759_create_match_team_join_table.rb b/db/migrate/20140307022759_create_match_team_join_table.rb new file mode 100644 index 0000000..c2ed1b7 --- /dev/null +++ b/db/migrate/20140307022759_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/20140307022818_add_hidden_attrs_to_user.rb index 2f1b0b2..2f1b0b2 100644 --- a/db/migrate/20140307004100_add_hidden_attrs_to_user.rb +++ b/db/migrate/20140307022818_add_hidden_attrs_to_user.rb |