diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-03-06 17:45:22 -0500 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-06 17:45:22 -0500 |
commit | 0c1299795a492e6296eb8e15bca576ea5139be6b (patch) | |
tree | 3921daf8c26d656b12b20ee22be63c97fa20f6fa /db/migrate | |
parent | 110d67f433c091a3b739c5bbebe110d963efaa73 (diff) | |
parent | fe7d5ad458b4cabd8fd57b47f81abc56dd8532ad (diff) |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
app/controllers/sessions_controller.rb
app/views/sessions/new.html.erb
Diffstat (limited to 'db/migrate')
-rw-r--r-- | db/migrate/20140306024709_create_tournaments.rb | 9 | ||||
-rw-r--r-- | db/migrate/20140306024720_create_games.rb | 13 | ||||
-rw-r--r-- | db/migrate/20140306024727_create_game_attributes.rb | 11 | ||||
-rw-r--r-- | db/migrate/20140306222309_create_servers.rb (renamed from db/migrate/20140306024707_create_servers.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140306222314_create_tournaments.rb | 16 | ||||
-rw-r--r-- | db/migrate/20140306222320_create_matches.rb (renamed from db/migrate/20140306024711_create_matches.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140306222325_create_teams.rb (renamed from db/migrate/20140306024713_create_teams.rb) | 1 | ||||
-rw-r--r-- | db/migrate/20140306222330_create_alerts.rb (renamed from db/migrate/20140306024715_create_alerts.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140306222336_create_pms.rb (renamed from db/migrate/20140306024718_create_pms.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140306222341_create_games.rb | 15 | ||||
-rw-r--r-- | db/migrate/20140306222347_create_users.rb (renamed from db/migrate/20140306024722_create_users.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140306222352_create_sessions.rb (renamed from db/migrate/20140306024724_create_sessions.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140306222357_create_server_settings.rb (renamed from db/migrate/20140306024729_create_server_settings.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140306222402_create_tournament_options.rb (renamed from db/migrate/20140306024735_create_tournament_options.rb) | 4 | ||||
-rw-r--r-- | db/migrate/20140306222407_create_game_options.rb | 11 | ||||
-rw-r--r-- | db/migrate/20140306222412_create_scores.rb | 11 | ||||
-rw-r--r-- | db/migrate/20140306222417_create_tournament_user_pairs.rb | 10 | ||||
-rw-r--r-- | db/migrate/20140306222422_create_user_team_pairs.rb (renamed from db/migrate/20140306024731_create_user_team_pairs.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140306222427_create_team_match_pairs.rb (renamed from db/migrate/20140306024733_create_team_match_pairs.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140306222447_add_hidden_attrs_to_user.rb (renamed from db/migrate/20140306024744_add_hidden_attrs_to_user.rb) | 0 |
20 files changed, 68 insertions, 33 deletions
diff --git a/db/migrate/20140306024709_create_tournaments.rb b/db/migrate/20140306024709_create_tournaments.rb deleted file mode 100644 index 36fcf7e..0000000 --- a/db/migrate/20140306024709_create_tournaments.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateTournaments < ActiveRecord::Migration - def change - create_table :tournaments do |t| - t.references :game, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140306024720_create_games.rb b/db/migrate/20140306024720_create_games.rb deleted file mode 100644 index 59d4ef0..0000000 --- a/db/migrate/20140306024720_create_games.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateGames < ActiveRecord::Migration - def change - create_table :games do |t| - t.text :name - t.integer :players_per_team - t.integer :teams_per_match - t.integer :set_rounds - t.integer :randomized_teams - - t.timestamps - end - end -end diff --git a/db/migrate/20140306024727_create_game_attributes.rb b/db/migrate/20140306024727_create_game_attributes.rb deleted file mode 100644 index b63f134..0000000 --- a/db/migrate/20140306024727_create_game_attributes.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateGameAttributes < ActiveRecord::Migration - def change - create_table :game_attributes do |t| - t.references :game, index: true - t.text :key - t.integer :type - - t.timestamps - end - end -end diff --git a/db/migrate/20140306024707_create_servers.rb b/db/migrate/20140306222309_create_servers.rb index f33241a..f33241a 100644 --- a/db/migrate/20140306024707_create_servers.rb +++ b/db/migrate/20140306222309_create_servers.rb diff --git a/db/migrate/20140306222314_create_tournaments.rb b/db/migrate/20140306222314_create_tournaments.rb new file mode 100644 index 0000000..c7ec765 --- /dev/null +++ b/db/migrate/20140306222314_create_tournaments.rb @@ -0,0 +1,16 @@ +class CreateTournaments < ActiveRecord::Migration + def change + create_table :tournaments do |t| + t.references :game, index: true + 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.integer :status + + t.timestamps + end + end +end diff --git a/db/migrate/20140306024711_create_matches.rb b/db/migrate/20140306222320_create_matches.rb index 325863d..325863d 100644 --- a/db/migrate/20140306024711_create_matches.rb +++ b/db/migrate/20140306222320_create_matches.rb diff --git a/db/migrate/20140306024713_create_teams.rb b/db/migrate/20140306222325_create_teams.rb index dd8397d..fdf9a68 100644 --- a/db/migrate/20140306024713_create_teams.rb +++ b/db/migrate/20140306222325_create_teams.rb @@ -1,6 +1,7 @@ class CreateTeams < ActiveRecord::Migration def change create_table :teams do |t| + t.references :match, index: true t.timestamps end diff --git a/db/migrate/20140306024715_create_alerts.rb b/db/migrate/20140306222330_create_alerts.rb index 68a8e10..68a8e10 100644 --- a/db/migrate/20140306024715_create_alerts.rb +++ b/db/migrate/20140306222330_create_alerts.rb diff --git a/db/migrate/20140306024718_create_pms.rb b/db/migrate/20140306222336_create_pms.rb index 93bb5c6..93bb5c6 100644 --- a/db/migrate/20140306024718_create_pms.rb +++ b/db/migrate/20140306222336_create_pms.rb diff --git a/db/migrate/20140306222341_create_games.rb b/db/migrate/20140306222341_create_games.rb new file mode 100644 index 0000000..5e4f56f --- /dev/null +++ b/db/migrate/20140306222341_create_games.rb @@ -0,0 +1,15 @@ +class CreateGames < ActiveRecord::Migration + def change + create_table :games do |t| + t.text :name + 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.timestamps + end + end +end diff --git a/db/migrate/20140306024722_create_users.rb b/db/migrate/20140306222347_create_users.rb index 8032870..8032870 100644 --- a/db/migrate/20140306024722_create_users.rb +++ b/db/migrate/20140306222347_create_users.rb diff --git a/db/migrate/20140306024724_create_sessions.rb b/db/migrate/20140306222352_create_sessions.rb index fe25bf2..fe25bf2 100644 --- a/db/migrate/20140306024724_create_sessions.rb +++ b/db/migrate/20140306222352_create_sessions.rb diff --git a/db/migrate/20140306024729_create_server_settings.rb b/db/migrate/20140306222357_create_server_settings.rb index dfdd91b..dfdd91b 100644 --- a/db/migrate/20140306024729_create_server_settings.rb +++ b/db/migrate/20140306222357_create_server_settings.rb diff --git a/db/migrate/20140306024735_create_tournament_options.rb b/db/migrate/20140306222402_create_tournament_options.rb index d2df22e..53b601c 100644 --- a/db/migrate/20140306024735_create_tournament_options.rb +++ b/db/migrate/20140306222402_create_tournament_options.rb @@ -1,6 +1,10 @@ class CreateTournamentOptions < ActiveRecord::Migration def change create_table :tournament_options do |t| + t.references :tournament, index: true + t.integer :vartype + t.string :name + t.text :value t.timestamps end diff --git a/db/migrate/20140306222407_create_game_options.rb b/db/migrate/20140306222407_create_game_options.rb new file mode 100644 index 0000000..2f62ef7 --- /dev/null +++ b/db/migrate/20140306222407_create_game_options.rb @@ -0,0 +1,11 @@ +class CreateGameOptions < ActiveRecord::Migration + def change + create_table :game_options do |t| + t.integer :vartype + t.string :name + t.text :default + + t.timestamps + end + end +end diff --git a/db/migrate/20140306222412_create_scores.rb b/db/migrate/20140306222412_create_scores.rb new file mode 100644 index 0000000..4ca0b0b --- /dev/null +++ b/db/migrate/20140306222412_create_scores.rb @@ -0,0 +1,11 @@ +class CreateScores < ActiveRecord::Migration + def change + create_table :scores do |t| + t.references :user, index: true + t.references :match, index: true + t.integer :value + + t.timestamps + end + end +end diff --git a/db/migrate/20140306222417_create_tournament_user_pairs.rb b/db/migrate/20140306222417_create_tournament_user_pairs.rb new file mode 100644 index 0000000..ab72aad --- /dev/null +++ b/db/migrate/20140306222417_create_tournament_user_pairs.rb @@ -0,0 +1,10 @@ +class CreateTournamentUserPairs < ActiveRecord::Migration + def change + create_table :tournament_user_pairs do |t| + t.references :tournament, index: true + t.references :user, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140306024731_create_user_team_pairs.rb b/db/migrate/20140306222422_create_user_team_pairs.rb index 2c492ac..2c492ac 100644 --- a/db/migrate/20140306024731_create_user_team_pairs.rb +++ b/db/migrate/20140306222422_create_user_team_pairs.rb diff --git a/db/migrate/20140306024733_create_team_match_pairs.rb b/db/migrate/20140306222427_create_team_match_pairs.rb index 8fac07e..8fac07e 100644 --- a/db/migrate/20140306024733_create_team_match_pairs.rb +++ b/db/migrate/20140306222427_create_team_match_pairs.rb diff --git a/db/migrate/20140306024744_add_hidden_attrs_to_user.rb b/db/migrate/20140306222447_add_hidden_attrs_to_user.rb index 2f1b0b2..2f1b0b2 100644 --- a/db/migrate/20140306024744_add_hidden_attrs_to_user.rb +++ b/db/migrate/20140306222447_add_hidden_attrs_to_user.rb |