diff options
author | guntasgrewal <guntasgrewal@gmail.com> | 2014-03-25 16:13:19 -0400 |
---|---|---|
committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-03-25 16:13:19 -0400 |
commit | 4d58cc07933fd0a0756c667b38f2e0658302aebf (patch) | |
tree | cf7eb70072b35a1eb1a88fbc3c1efcc619001d9d /db/migrate | |
parent | 2f60c447146fd7b6c1604388194b918b8ae3a7b4 (diff) | |
parent | ecef4973baed5580e3b2500ce0a65def1132d172 (diff) |
Merge branch 'clean'
Diffstat (limited to 'db/migrate')
-rw-r--r-- | db/migrate/20140307052409_create_game_options.rb | 11 | ||||
-rw-r--r-- | db/migrate/20140325201020_create_servers.rb (renamed from db/migrate/20140307052327_create_servers.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140325201022_create_matches.rb (renamed from db/migrate/20140307052331_create_matches.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140325201025_create_teams.rb (renamed from db/migrate/20140307052334_create_teams.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140325201027_create_alerts.rb (renamed from db/migrate/20140307052338_create_alerts.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140325201030_create_pms.rb (renamed from db/migrate/20140307052342_create_pms.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140325201033_create_tournaments.rb (renamed from db/migrate/20140307052346_create_tournaments.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140325201035_create_games.rb (renamed from db/migrate/20140307052350_create_games.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140325201038_create_users.rb (renamed from db/migrate/20140307052354_create_users.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140325201040_create_sessions.rb (renamed from db/migrate/20140307052358_create_sessions.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140325201043_create_server_settings.rb (renamed from db/migrate/20140307052402_create_server_settings.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140325201045_create_tournament_options.rb (renamed from db/migrate/20140307052405_create_tournament_options.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140325201047_create_game_settings.rb | 15 | ||||
-rw-r--r-- | db/migrate/20140325201050_create_scores.rb (renamed from db/migrate/20140307052413_create_scores.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140325201052_create_tournament_players_join_table.rb (renamed from db/migrate/20140307052417_create_tournament_players_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140325201055_create_tournament_hosts_join_table.rb (renamed from db/migrate/20140307052421_create_tournament_hosts_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140325201057_create_team_user_join_table.rb (renamed from db/migrate/20140307052424_create_team_user_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140325201059_create_match_team_join_table.rb (renamed from db/migrate/20140307052428_create_match_team_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140325201109_add_hidden_attrs_to_user.rb (renamed from db/migrate/20140307052443_add_hidden_attrs_to_user.rb) | 0 |
19 files changed, 15 insertions, 11 deletions
diff --git a/db/migrate/20140307052409_create_game_options.rb b/db/migrate/20140307052409_create_game_options.rb deleted file mode 100644 index 2f62ef7..0000000 --- a/db/migrate/20140307052409_create_game_options.rb +++ /dev/null @@ -1,11 +0,0 @@ -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/20140307052327_create_servers.rb b/db/migrate/20140325201020_create_servers.rb index f33241a..f33241a 100644 --- a/db/migrate/20140307052327_create_servers.rb +++ b/db/migrate/20140325201020_create_servers.rb diff --git a/db/migrate/20140307052331_create_matches.rb b/db/migrate/20140325201022_create_matches.rb index 67a5b7b..67a5b7b 100644 --- a/db/migrate/20140307052331_create_matches.rb +++ b/db/migrate/20140325201022_create_matches.rb diff --git a/db/migrate/20140307052334_create_teams.rb b/db/migrate/20140325201025_create_teams.rb index fdf9a68..fdf9a68 100644 --- a/db/migrate/20140307052334_create_teams.rb +++ b/db/migrate/20140325201025_create_teams.rb diff --git a/db/migrate/20140307052338_create_alerts.rb b/db/migrate/20140325201027_create_alerts.rb index 68a8e10..68a8e10 100644 --- a/db/migrate/20140307052338_create_alerts.rb +++ b/db/migrate/20140325201027_create_alerts.rb diff --git a/db/migrate/20140307052342_create_pms.rb b/db/migrate/20140325201030_create_pms.rb index 93bb5c6..93bb5c6 100644 --- a/db/migrate/20140307052342_create_pms.rb +++ b/db/migrate/20140325201030_create_pms.rb diff --git a/db/migrate/20140307052346_create_tournaments.rb b/db/migrate/20140325201033_create_tournaments.rb index 545e603..545e603 100644 --- a/db/migrate/20140307052346_create_tournaments.rb +++ b/db/migrate/20140325201033_create_tournaments.rb diff --git a/db/migrate/20140307052350_create_games.rb b/db/migrate/20140325201035_create_games.rb index 5e4f56f..5e4f56f 100644 --- a/db/migrate/20140307052350_create_games.rb +++ b/db/migrate/20140325201035_create_games.rb diff --git a/db/migrate/20140307052354_create_users.rb b/db/migrate/20140325201038_create_users.rb index 8032870..8032870 100644 --- a/db/migrate/20140307052354_create_users.rb +++ b/db/migrate/20140325201038_create_users.rb diff --git a/db/migrate/20140307052358_create_sessions.rb b/db/migrate/20140325201040_create_sessions.rb index fe25bf2..fe25bf2 100644 --- a/db/migrate/20140307052358_create_sessions.rb +++ b/db/migrate/20140325201040_create_sessions.rb diff --git a/db/migrate/20140307052402_create_server_settings.rb b/db/migrate/20140325201043_create_server_settings.rb index dfdd91b..dfdd91b 100644 --- a/db/migrate/20140307052402_create_server_settings.rb +++ b/db/migrate/20140325201043_create_server_settings.rb diff --git a/db/migrate/20140307052405_create_tournament_options.rb b/db/migrate/20140325201045_create_tournament_options.rb index 53b601c..53b601c 100644 --- a/db/migrate/20140307052405_create_tournament_options.rb +++ b/db/migrate/20140325201045_create_tournament_options.rb diff --git a/db/migrate/20140325201047_create_game_settings.rb b/db/migrate/20140325201047_create_game_settings.rb new file mode 100644 index 0000000..0ebbf18 --- /dev/null +++ b/db/migrate/20140325201047_create_game_settings.rb @@ -0,0 +1,15 @@ +class CreateGameSettings < ActiveRecord::Migration + def change + create_table :game_settings do |t| + t.references :game, index: true + t.integer :type + t.string :name + t.text :default + t.text :discription + t.text :type_opt + t.integer :display_order + + t.timestamps + end + end +end diff --git a/db/migrate/20140307052413_create_scores.rb b/db/migrate/20140325201050_create_scores.rb index 4ca0b0b..4ca0b0b 100644 --- a/db/migrate/20140307052413_create_scores.rb +++ b/db/migrate/20140325201050_create_scores.rb diff --git a/db/migrate/20140307052417_create_tournament_players_join_table.rb b/db/migrate/20140325201052_create_tournament_players_join_table.rb index be240e8..be240e8 100644 --- a/db/migrate/20140307052417_create_tournament_players_join_table.rb +++ b/db/migrate/20140325201052_create_tournament_players_join_table.rb diff --git a/db/migrate/20140307052421_create_tournament_hosts_join_table.rb b/db/migrate/20140325201055_create_tournament_hosts_join_table.rb index 7521d89..7521d89 100644 --- a/db/migrate/20140307052421_create_tournament_hosts_join_table.rb +++ b/db/migrate/20140325201055_create_tournament_hosts_join_table.rb diff --git a/db/migrate/20140307052424_create_team_user_join_table.rb b/db/migrate/20140325201057_create_team_user_join_table.rb index f3b57fc..f3b57fc 100644 --- a/db/migrate/20140307052424_create_team_user_join_table.rb +++ b/db/migrate/20140325201057_create_team_user_join_table.rb diff --git a/db/migrate/20140307052428_create_match_team_join_table.rb b/db/migrate/20140325201059_create_match_team_join_table.rb index c2ed1b7..c2ed1b7 100644 --- a/db/migrate/20140307052428_create_match_team_join_table.rb +++ b/db/migrate/20140325201059_create_match_team_join_table.rb diff --git a/db/migrate/20140307052443_add_hidden_attrs_to_user.rb b/db/migrate/20140325201109_add_hidden_attrs_to_user.rb index 2f1b0b2..2f1b0b2 100644 --- a/db/migrate/20140307052443_add_hidden_attrs_to_user.rb +++ b/db/migrate/20140325201109_add_hidden_attrs_to_user.rb |