diff options
author | tkimia <tkimia@purdue.edu> | 2014-04-22 01:50:36 -0400 |
---|---|---|
committer | tkimia <tkimia@purdue.edu> | 2014-04-22 01:50:36 -0400 |
commit | 9c0e7d91ec76c44ca63f87b2bcd46ff16cacc38b (patch) | |
tree | 163b6c1eb5d9b97a8836f176e7d90f209458ce04 /db/migrate | |
parent | d75fe3934366ea5e2581df6111c6bccdb77d1e95 (diff) | |
parent | aa8437947b28dda73bcfaf3caccb738e5e2f48b3 (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'db/migrate')
-rw-r--r-- | db/migrate/20140410213844_create_server_settings.rb | 8 | ||||
-rw-r--r-- | db/migrate/20140410213857_create_tournament_preferences.rb | 12 | ||||
-rw-r--r-- | db/migrate/20140421103137_create_simple_captcha_data.rb (renamed from db/migrate/20140410173725_create_simple_captcha_data.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140421143140_create_delayed_jobs.rb (renamed from db/migrate/20140410213731_create_delayed_jobs.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140421143143_create_servers.rb (renamed from db/migrate/20140410213738_create_servers.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140421143146_create_matches.rb (renamed from db/migrate/20140410213745_create_matches.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140421143149_create_teams.rb (renamed from db/migrate/20140410213752_create_teams.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140421143152_create_alerts.rb (renamed from db/migrate/20140410213758_create_alerts.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140421143155_create_pms.rb (renamed from db/migrate/20140410213805_create_pms.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140421143158_create_tournaments.rb (renamed from db/migrate/20140410213811_create_tournaments.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140421143201_create_games.rb (renamed from db/migrate/20140410213818_create_games.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140421143204_create_users.rb (renamed from db/migrate/20140410213824_create_users.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140421143207_create_sessions.rb (renamed from db/migrate/20140410213831_create_sessions.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140421143210_create_brackets.rb (renamed from db/migrate/20140410213838_create_brackets.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140421143213_create_game_settings.rb (renamed from db/migrate/20140410213851_create_game_settings.rb) | 6 | ||||
-rw-r--r-- | db/migrate/20140421143216_create_tournament_settings.rb | 15 | ||||
-rw-r--r-- | db/migrate/20140421143219_create_scores.rb (renamed from db/migrate/20140410213903_create_scores.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140421143222_create_remote_usernames.rb (renamed from db/migrate/20140410213909_create_remote_usernames.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140421143225_create_bracket_matches.rb (renamed from db/migrate/20140410213916_create_bracket_matches.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140421143228_create_api_requests.rb | 9 | ||||
-rw-r--r-- | db/migrate/20140421143231_create_tournament_players_join_table.rb (renamed from db/migrate/20140410213922_create_tournament_players_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140421143234_create_tournament_hosts_join_table.rb (renamed from db/migrate/20140410213928_create_tournament_hosts_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140421143237_create_team_user_join_table.rb (renamed from db/migrate/20140410213935_create_team_user_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140421143239_create_match_team_join_table.rb (renamed from db/migrate/20140410213941_create_match_team_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140421143251_add_hidden_attrs_to_user.rb (renamed from db/migrate/20140410214006_add_hidden_attrs_to_user.rb) | 0 |
25 files changed, 27 insertions, 23 deletions
diff --git a/db/migrate/20140410213844_create_server_settings.rb b/db/migrate/20140410213844_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140410213844_create_server_settings.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateServerSettings < ActiveRecord::Migration - def change - create_table :server_settings do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140410213857_create_tournament_preferences.rb b/db/migrate/20140410213857_create_tournament_preferences.rb deleted file mode 100644 index 991d659..0000000 --- a/db/migrate/20140410213857_create_tournament_preferences.rb +++ /dev/null @@ -1,12 +0,0 @@ -class CreateTournamentPreferences < ActiveRecord::Migration - def change - create_table :tournament_preferences do |t| - t.references :tournament, index: true - t.integer :vartype - t.string :name - t.text :value - - t.timestamps - end - end -end diff --git a/db/migrate/20140410173725_create_simple_captcha_data.rb b/db/migrate/20140421103137_create_simple_captcha_data.rb index 4573b20..4573b20 100644 --- a/db/migrate/20140410173725_create_simple_captcha_data.rb +++ b/db/migrate/20140421103137_create_simple_captcha_data.rb diff --git a/db/migrate/20140410213731_create_delayed_jobs.rb b/db/migrate/20140421143140_create_delayed_jobs.rb index ec0dd93..ec0dd93 100644 --- a/db/migrate/20140410213731_create_delayed_jobs.rb +++ b/db/migrate/20140421143140_create_delayed_jobs.rb diff --git a/db/migrate/20140410213738_create_servers.rb b/db/migrate/20140421143143_create_servers.rb index fbe1b02..fbe1b02 100644 --- a/db/migrate/20140410213738_create_servers.rb +++ b/db/migrate/20140421143143_create_servers.rb diff --git a/db/migrate/20140410213745_create_matches.rb b/db/migrate/20140421143146_create_matches.rb index bdeb1cd..bdeb1cd 100644 --- a/db/migrate/20140410213745_create_matches.rb +++ b/db/migrate/20140421143146_create_matches.rb diff --git a/db/migrate/20140410213752_create_teams.rb b/db/migrate/20140421143149_create_teams.rb index fdf9a68..fdf9a68 100644 --- a/db/migrate/20140410213752_create_teams.rb +++ b/db/migrate/20140421143149_create_teams.rb diff --git a/db/migrate/20140410213758_create_alerts.rb b/db/migrate/20140421143152_create_alerts.rb index 68a8e10..68a8e10 100644 --- a/db/migrate/20140410213758_create_alerts.rb +++ b/db/migrate/20140421143152_create_alerts.rb diff --git a/db/migrate/20140410213805_create_pms.rb b/db/migrate/20140421143155_create_pms.rb index 93bb5c6..93bb5c6 100644 --- a/db/migrate/20140410213805_create_pms.rb +++ b/db/migrate/20140421143155_create_pms.rb diff --git a/db/migrate/20140410213811_create_tournaments.rb b/db/migrate/20140421143158_create_tournaments.rb index c0d8929..c0d8929 100644 --- a/db/migrate/20140410213811_create_tournaments.rb +++ b/db/migrate/20140421143158_create_tournaments.rb diff --git a/db/migrate/20140410213818_create_games.rb b/db/migrate/20140421143201_create_games.rb index 5e4f56f..5e4f56f 100644 --- a/db/migrate/20140410213818_create_games.rb +++ b/db/migrate/20140421143201_create_games.rb diff --git a/db/migrate/20140410213824_create_users.rb b/db/migrate/20140421143204_create_users.rb index 8032870..8032870 100644 --- a/db/migrate/20140410213824_create_users.rb +++ b/db/migrate/20140421143204_create_users.rb diff --git a/db/migrate/20140410213831_create_sessions.rb b/db/migrate/20140421143207_create_sessions.rb index f667f1e..f667f1e 100644 --- a/db/migrate/20140410213831_create_sessions.rb +++ b/db/migrate/20140421143207_create_sessions.rb diff --git a/db/migrate/20140410213838_create_brackets.rb b/db/migrate/20140421143210_create_brackets.rb index 8813bf2..8813bf2 100644 --- a/db/migrate/20140410213838_create_brackets.rb +++ b/db/migrate/20140421143210_create_brackets.rb diff --git a/db/migrate/20140410213851_create_game_settings.rb b/db/migrate/20140421143213_create_game_settings.rb index b1caf5d..06fb72e 100644 --- a/db/migrate/20140410213851_create_game_settings.rb +++ b/db/migrate/20140421143213_create_game_settings.rb @@ -2,12 +2,12 @@ class CreateGameSettings < ActiveRecord::Migration def change create_table :game_settings do |t| t.references :game, index: true - t.integer :stype t.string :name - t.text :default - t.text :description + t.integer :vartype t.text :type_opt + t.text :description t.integer :display_order + t.text :default t.timestamps end diff --git a/db/migrate/20140421143216_create_tournament_settings.rb b/db/migrate/20140421143216_create_tournament_settings.rb new file mode 100644 index 0000000..e56697f --- /dev/null +++ b/db/migrate/20140421143216_create_tournament_settings.rb @@ -0,0 +1,15 @@ +class CreateTournamentSettings < ActiveRecord::Migration + def change + create_table :tournament_settings do |t| + t.references :tournament, index: true + t.string :name + t.integer :vartype + t.text :type_opt + t.text :description + t.integer :display_order + t.text :value + + t.timestamps + end + end +end diff --git a/db/migrate/20140410213903_create_scores.rb b/db/migrate/20140421143219_create_scores.rb index 4ca0b0b..4ca0b0b 100644 --- a/db/migrate/20140410213903_create_scores.rb +++ b/db/migrate/20140421143219_create_scores.rb diff --git a/db/migrate/20140410213909_create_remote_usernames.rb b/db/migrate/20140421143222_create_remote_usernames.rb index e265985..e265985 100644 --- a/db/migrate/20140410213909_create_remote_usernames.rb +++ b/db/migrate/20140421143222_create_remote_usernames.rb diff --git a/db/migrate/20140410213916_create_bracket_matches.rb b/db/migrate/20140421143225_create_bracket_matches.rb index 3323e31..3323e31 100644 --- a/db/migrate/20140410213916_create_bracket_matches.rb +++ b/db/migrate/20140421143225_create_bracket_matches.rb diff --git a/db/migrate/20140421143228_create_api_requests.rb b/db/migrate/20140421143228_create_api_requests.rb new file mode 100644 index 0000000..544c330 --- /dev/null +++ b/db/migrate/20140421143228_create_api_requests.rb @@ -0,0 +1,9 @@ +class CreateApiRequests < ActiveRecord::Migration + def change + create_table :api_requests do |t| + t.string :api_name + + t.timestamps + end + end +end diff --git a/db/migrate/20140410213922_create_tournament_players_join_table.rb b/db/migrate/20140421143231_create_tournament_players_join_table.rb index be240e8..be240e8 100644 --- a/db/migrate/20140410213922_create_tournament_players_join_table.rb +++ b/db/migrate/20140421143231_create_tournament_players_join_table.rb diff --git a/db/migrate/20140410213928_create_tournament_hosts_join_table.rb b/db/migrate/20140421143234_create_tournament_hosts_join_table.rb index 7521d89..7521d89 100644 --- a/db/migrate/20140410213928_create_tournament_hosts_join_table.rb +++ b/db/migrate/20140421143234_create_tournament_hosts_join_table.rb diff --git a/db/migrate/20140410213935_create_team_user_join_table.rb b/db/migrate/20140421143237_create_team_user_join_table.rb index f3b57fc..f3b57fc 100644 --- a/db/migrate/20140410213935_create_team_user_join_table.rb +++ b/db/migrate/20140421143237_create_team_user_join_table.rb diff --git a/db/migrate/20140410213941_create_match_team_join_table.rb b/db/migrate/20140421143239_create_match_team_join_table.rb index c2ed1b7..c2ed1b7 100644 --- a/db/migrate/20140410213941_create_match_team_join_table.rb +++ b/db/migrate/20140421143239_create_match_team_join_table.rb diff --git a/db/migrate/20140410214006_add_hidden_attrs_to_user.rb b/db/migrate/20140421143251_add_hidden_attrs_to_user.rb index 9b5c505..9b5c505 100644 --- a/db/migrate/20140410214006_add_hidden_attrs_to_user.rb +++ b/db/migrate/20140421143251_add_hidden_attrs_to_user.rb |