From ecef4973baed5580e3b2500ce0a65def1132d172 Mon Sep 17 00:00:00 2001 From: guntasgrewal Date: Tue, 25 Mar 2014 16:12:18 -0400 Subject: Changes to generate.sh --- app/models/game_option.rb | 2 -- app/models/game_setting.rb | 3 +++ db/migrate/20140307052327_create_servers.rb | 8 -------- db/migrate/20140307052331_create_matches.rb | 11 ----------- db/migrate/20140307052334_create_teams.rb | 9 --------- db/migrate/20140307052338_create_alerts.rb | 10 ---------- db/migrate/20140307052342_create_pms.rb | 11 ----------- db/migrate/20140307052346_create_tournaments.rb | 16 ---------------- db/migrate/20140307052350_create_games.rb | 15 --------------- db/migrate/20140307052354_create_users.rb | 13 ------------- db/migrate/20140307052358_create_sessions.rb | 9 --------- db/migrate/20140307052402_create_server_settings.rb | 8 -------- .../20140307052405_create_tournament_options.rb | 12 ------------ db/migrate/20140307052409_create_game_options.rb | 11 ----------- db/migrate/20140307052413_create_scores.rb | 11 ----------- ...0307052417_create_tournament_players_join_table.rb | 8 -------- ...140307052421_create_tournament_hosts_join_table.rb | 8 -------- .../20140307052424_create_team_user_join_table.rb | 8 -------- .../20140307052428_create_match_team_join_table.rb | 8 -------- db/migrate/20140307052443_add_hidden_attrs_to_user.rb | 8 -------- db/migrate/20140325201020_create_servers.rb | 8 ++++++++ db/migrate/20140325201022_create_matches.rb | 11 +++++++++++ db/migrate/20140325201025_create_teams.rb | 9 +++++++++ db/migrate/20140325201027_create_alerts.rb | 10 ++++++++++ db/migrate/20140325201030_create_pms.rb | 11 +++++++++++ db/migrate/20140325201033_create_tournaments.rb | 16 ++++++++++++++++ db/migrate/20140325201035_create_games.rb | 15 +++++++++++++++ db/migrate/20140325201038_create_users.rb | 13 +++++++++++++ db/migrate/20140325201040_create_sessions.rb | 9 +++++++++ db/migrate/20140325201043_create_server_settings.rb | 8 ++++++++ .../20140325201045_create_tournament_options.rb | 12 ++++++++++++ db/migrate/20140325201047_create_game_settings.rb | 15 +++++++++++++++ db/migrate/20140325201050_create_scores.rb | 11 +++++++++++ ...0325201052_create_tournament_players_join_table.rb | 8 ++++++++ ...140325201055_create_tournament_hosts_join_table.rb | 8 ++++++++ .../20140325201057_create_team_user_join_table.rb | 8 ++++++++ .../20140325201059_create_match_team_join_table.rb | 8 ++++++++ db/migrate/20140325201109_add_hidden_attrs_to_user.rb | 8 ++++++++ db/schema.rb | 12 +++++++++--- generate.sh | 2 +- test/fixtures/game_options.yml | 11 ----------- test/fixtures/game_settings.yml | 19 +++++++++++++++++++ test/models/game_option_test.rb | 7 ------- test/models/game_setting_test.rb | 7 +++++++ 44 files changed, 227 insertions(+), 208 deletions(-) delete mode 100644 app/models/game_option.rb create mode 100644 app/models/game_setting.rb delete mode 100644 db/migrate/20140307052327_create_servers.rb delete mode 100644 db/migrate/20140307052331_create_matches.rb delete mode 100644 db/migrate/20140307052334_create_teams.rb delete mode 100644 db/migrate/20140307052338_create_alerts.rb delete mode 100644 db/migrate/20140307052342_create_pms.rb delete mode 100644 db/migrate/20140307052346_create_tournaments.rb delete mode 100644 db/migrate/20140307052350_create_games.rb delete mode 100644 db/migrate/20140307052354_create_users.rb delete mode 100644 db/migrate/20140307052358_create_sessions.rb delete mode 100644 db/migrate/20140307052402_create_server_settings.rb delete mode 100644 db/migrate/20140307052405_create_tournament_options.rb delete mode 100644 db/migrate/20140307052409_create_game_options.rb delete mode 100644 db/migrate/20140307052413_create_scores.rb delete mode 100644 db/migrate/20140307052417_create_tournament_players_join_table.rb delete mode 100644 db/migrate/20140307052421_create_tournament_hosts_join_table.rb delete mode 100644 db/migrate/20140307052424_create_team_user_join_table.rb delete mode 100644 db/migrate/20140307052428_create_match_team_join_table.rb delete mode 100644 db/migrate/20140307052443_add_hidden_attrs_to_user.rb create mode 100644 db/migrate/20140325201020_create_servers.rb create mode 100644 db/migrate/20140325201022_create_matches.rb create mode 100644 db/migrate/20140325201025_create_teams.rb create mode 100644 db/migrate/20140325201027_create_alerts.rb create mode 100644 db/migrate/20140325201030_create_pms.rb create mode 100644 db/migrate/20140325201033_create_tournaments.rb create mode 100644 db/migrate/20140325201035_create_games.rb create mode 100644 db/migrate/20140325201038_create_users.rb create mode 100644 db/migrate/20140325201040_create_sessions.rb create mode 100644 db/migrate/20140325201043_create_server_settings.rb create mode 100644 db/migrate/20140325201045_create_tournament_options.rb create mode 100644 db/migrate/20140325201047_create_game_settings.rb create mode 100644 db/migrate/20140325201050_create_scores.rb create mode 100644 db/migrate/20140325201052_create_tournament_players_join_table.rb create mode 100644 db/migrate/20140325201055_create_tournament_hosts_join_table.rb create mode 100644 db/migrate/20140325201057_create_team_user_join_table.rb create mode 100644 db/migrate/20140325201059_create_match_team_join_table.rb create mode 100644 db/migrate/20140325201109_add_hidden_attrs_to_user.rb delete mode 100644 test/fixtures/game_options.yml create mode 100644 test/fixtures/game_settings.yml delete mode 100644 test/models/game_option_test.rb create mode 100644 test/models/game_setting_test.rb diff --git a/app/models/game_option.rb b/app/models/game_option.rb deleted file mode 100644 index bdc5560..0000000 --- a/app/models/game_option.rb +++ /dev/null @@ -1,2 +0,0 @@ -class GameOption < ActiveRecord::Base -end diff --git a/app/models/game_setting.rb b/app/models/game_setting.rb new file mode 100644 index 0000000..e147b15 --- /dev/null +++ b/app/models/game_setting.rb @@ -0,0 +1,3 @@ +class GameSetting < ActiveRecord::Base + belongs_to :game +end diff --git a/db/migrate/20140307052327_create_servers.rb b/db/migrate/20140307052327_create_servers.rb deleted file mode 100644 index f33241a..0000000 --- a/db/migrate/20140307052327_create_servers.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateServers < ActiveRecord::Migration - def change - create_table :servers do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140307052331_create_matches.rb b/db/migrate/20140307052331_create_matches.rb deleted file mode 100644 index 67a5b7b..0000000 --- a/db/migrate/20140307052331_create_matches.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateMatches < ActiveRecord::Migration - def change - create_table :matches do |t| - t.references :tournament, index: true - t.string :name - t.references :winner, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140307052334_create_teams.rb b/db/migrate/20140307052334_create_teams.rb deleted file mode 100644 index fdf9a68..0000000 --- a/db/migrate/20140307052334_create_teams.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateTeams < ActiveRecord::Migration - def change - create_table :teams do |t| - t.references :match, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140307052338_create_alerts.rb b/db/migrate/20140307052338_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140307052338_create_alerts.rb +++ /dev/null @@ -1,10 +0,0 @@ -class CreateAlerts < ActiveRecord::Migration - def change - create_table :alerts do |t| - t.references :author, index: true - t.text :message - - t.timestamps - end - end -end diff --git a/db/migrate/20140307052342_create_pms.rb b/db/migrate/20140307052342_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140307052342_create_pms.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreatePms < ActiveRecord::Migration - def change - create_table :pms do |t| - t.references :author, index: true - t.references :recipient, index: true - t.text :message - - t.timestamps - end - end -end diff --git a/db/migrate/20140307052346_create_tournaments.rb b/db/migrate/20140307052346_create_tournaments.rb deleted file mode 100644 index 545e603..0000000 --- a/db/migrate/20140307052346_create_tournaments.rb +++ /dev/null @@ -1,16 +0,0 @@ -class CreateTournaments < ActiveRecord::Migration - def change - create_table :tournaments do |t| - t.references :game, index: true - t.integer :status - 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/20140307052350_create_games.rb b/db/migrate/20140307052350_create_games.rb deleted file mode 100644 index 5e4f56f..0000000 --- a/db/migrate/20140307052350_create_games.rb +++ /dev/null @@ -1,15 +0,0 @@ -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/20140307052354_create_users.rb b/db/migrate/20140307052354_create_users.rb deleted file mode 100644 index 8032870..0000000 --- a/db/migrate/20140307052354_create_users.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateUsers < ActiveRecord::Migration - def change - create_table :users do |t| - t.string :name - t.string :email - t.string :user_name - - t.timestamps - end - add_index :users, :email, unique: true - add_index :users, :user_name, unique: true - end -end diff --git a/db/migrate/20140307052358_create_sessions.rb b/db/migrate/20140307052358_create_sessions.rb deleted file mode 100644 index fe25bf2..0000000 --- a/db/migrate/20140307052358_create_sessions.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateSessions < ActiveRecord::Migration - def change - create_table :sessions do |t| - t.references :user, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140307052402_create_server_settings.rb b/db/migrate/20140307052402_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140307052402_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/20140307052405_create_tournament_options.rb b/db/migrate/20140307052405_create_tournament_options.rb deleted file mode 100644 index 53b601c..0000000 --- a/db/migrate/20140307052405_create_tournament_options.rb +++ /dev/null @@ -1,12 +0,0 @@ -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 - end -end 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/20140307052413_create_scores.rb b/db/migrate/20140307052413_create_scores.rb deleted file mode 100644 index 4ca0b0b..0000000 --- a/db/migrate/20140307052413_create_scores.rb +++ /dev/null @@ -1,11 +0,0 @@ -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/20140307052417_create_tournament_players_join_table.rb b/db/migrate/20140307052417_create_tournament_players_join_table.rb deleted file mode 100644 index be240e8..0000000 --- a/db/migrate/20140307052417_create_tournament_players_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -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/20140307052421_create_tournament_hosts_join_table.rb b/db/migrate/20140307052421_create_tournament_hosts_join_table.rb deleted file mode 100644 index 7521d89..0000000 --- a/db/migrate/20140307052421_create_tournament_hosts_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -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/20140307052424_create_team_user_join_table.rb b/db/migrate/20140307052424_create_team_user_join_table.rb deleted file mode 100644 index f3b57fc..0000000 --- a/db/migrate/20140307052424_create_team_user_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTeamUserJoinTable < ActiveRecord::Migration - def change - create_join_table :teams, :users do |t| - # t.index [:team_id, :user_id] - # t.index [:user_id, :team_id] - end - end -end diff --git a/db/migrate/20140307052428_create_match_team_join_table.rb b/db/migrate/20140307052428_create_match_team_join_table.rb deleted file mode 100644 index c2ed1b7..0000000 --- a/db/migrate/20140307052428_create_match_team_join_table.rb +++ /dev/null @@ -1,8 +0,0 @@ -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/20140307052443_add_hidden_attrs_to_user.rb b/db/migrate/20140307052443_add_hidden_attrs_to_user.rb deleted file mode 100644 index 2f1b0b2..0000000 --- a/db/migrate/20140307052443_add_hidden_attrs_to_user.rb +++ /dev/null @@ -1,8 +0,0 @@ -class AddHiddenAttrsToUser < ActiveRecord::Migration - def change - add_column :users, :password_digest, :string - add_column :users, :remember_token, :string - add_index :users, :remember_token, unique: true - add_column :users, :groups, :integer - end -end diff --git a/db/migrate/20140325201020_create_servers.rb b/db/migrate/20140325201020_create_servers.rb new file mode 100644 index 0000000..f33241a --- /dev/null +++ b/db/migrate/20140325201020_create_servers.rb @@ -0,0 +1,8 @@ +class CreateServers < ActiveRecord::Migration + def change + create_table :servers do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140325201022_create_matches.rb b/db/migrate/20140325201022_create_matches.rb new file mode 100644 index 0000000..67a5b7b --- /dev/null +++ b/db/migrate/20140325201022_create_matches.rb @@ -0,0 +1,11 @@ +class CreateMatches < ActiveRecord::Migration + def change + create_table :matches do |t| + t.references :tournament, index: true + t.string :name + t.references :winner, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140325201025_create_teams.rb b/db/migrate/20140325201025_create_teams.rb new file mode 100644 index 0000000..fdf9a68 --- /dev/null +++ b/db/migrate/20140325201025_create_teams.rb @@ -0,0 +1,9 @@ +class CreateTeams < ActiveRecord::Migration + def change + create_table :teams do |t| + t.references :match, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140325201027_create_alerts.rb b/db/migrate/20140325201027_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140325201027_create_alerts.rb @@ -0,0 +1,10 @@ +class CreateAlerts < ActiveRecord::Migration + def change + create_table :alerts do |t| + t.references :author, index: true + t.text :message + + t.timestamps + end + end +end diff --git a/db/migrate/20140325201030_create_pms.rb b/db/migrate/20140325201030_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140325201030_create_pms.rb @@ -0,0 +1,11 @@ +class CreatePms < ActiveRecord::Migration + def change + create_table :pms do |t| + t.references :author, index: true + t.references :recipient, index: true + t.text :message + + t.timestamps + end + end +end diff --git a/db/migrate/20140325201033_create_tournaments.rb b/db/migrate/20140325201033_create_tournaments.rb new file mode 100644 index 0000000..545e603 --- /dev/null +++ b/db/migrate/20140325201033_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 :status + 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/20140325201035_create_games.rb b/db/migrate/20140325201035_create_games.rb new file mode 100644 index 0000000..5e4f56f --- /dev/null +++ b/db/migrate/20140325201035_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/20140325201038_create_users.rb b/db/migrate/20140325201038_create_users.rb new file mode 100644 index 0000000..8032870 --- /dev/null +++ b/db/migrate/20140325201038_create_users.rb @@ -0,0 +1,13 @@ +class CreateUsers < ActiveRecord::Migration + def change + create_table :users do |t| + t.string :name + t.string :email + t.string :user_name + + t.timestamps + end + add_index :users, :email, unique: true + add_index :users, :user_name, unique: true + end +end diff --git a/db/migrate/20140325201040_create_sessions.rb b/db/migrate/20140325201040_create_sessions.rb new file mode 100644 index 0000000..fe25bf2 --- /dev/null +++ b/db/migrate/20140325201040_create_sessions.rb @@ -0,0 +1,9 @@ +class CreateSessions < ActiveRecord::Migration + def change + create_table :sessions do |t| + t.references :user, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140325201043_create_server_settings.rb b/db/migrate/20140325201043_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140325201043_create_server_settings.rb @@ -0,0 +1,8 @@ +class CreateServerSettings < ActiveRecord::Migration + def change + create_table :server_settings do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140325201045_create_tournament_options.rb b/db/migrate/20140325201045_create_tournament_options.rb new file mode 100644 index 0000000..53b601c --- /dev/null +++ b/db/migrate/20140325201045_create_tournament_options.rb @@ -0,0 +1,12 @@ +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 + end +end 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/20140325201050_create_scores.rb b/db/migrate/20140325201050_create_scores.rb new file mode 100644 index 0000000..4ca0b0b --- /dev/null +++ b/db/migrate/20140325201050_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/20140325201052_create_tournament_players_join_table.rb b/db/migrate/20140325201052_create_tournament_players_join_table.rb new file mode 100644 index 0000000..be240e8 --- /dev/null +++ b/db/migrate/20140325201052_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/20140325201055_create_tournament_hosts_join_table.rb b/db/migrate/20140325201055_create_tournament_hosts_join_table.rb new file mode 100644 index 0000000..7521d89 --- /dev/null +++ b/db/migrate/20140325201055_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/20140325201057_create_team_user_join_table.rb b/db/migrate/20140325201057_create_team_user_join_table.rb new file mode 100644 index 0000000..f3b57fc --- /dev/null +++ b/db/migrate/20140325201057_create_team_user_join_table.rb @@ -0,0 +1,8 @@ +class CreateTeamUserJoinTable < ActiveRecord::Migration + def change + create_join_table :teams, :users do |t| + # t.index [:team_id, :user_id] + # t.index [:user_id, :team_id] + end + end +end diff --git a/db/migrate/20140325201059_create_match_team_join_table.rb b/db/migrate/20140325201059_create_match_team_join_table.rb new file mode 100644 index 0000000..c2ed1b7 --- /dev/null +++ b/db/migrate/20140325201059_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/20140325201109_add_hidden_attrs_to_user.rb b/db/migrate/20140325201109_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..2f1b0b2 --- /dev/null +++ b/db/migrate/20140325201109_add_hidden_attrs_to_user.rb @@ -0,0 +1,8 @@ +class AddHiddenAttrsToUser < ActiveRecord::Migration + def change + add_column :users, :password_digest, :string + add_column :users, :remember_token, :string + add_index :users, :remember_token, unique: true + add_column :users, :groups, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 55f4046..0394946 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: 20140307052443) do +ActiveRecord::Schema.define(version: 20140325201109) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -22,14 +22,20 @@ ActiveRecord::Schema.define(version: 20140307052443) do add_index "alerts", ["author_id"], name: "index_alerts_on_author_id" - create_table "game_options", force: true do |t| - t.integer "vartype" + create_table "game_settings", force: true do |t| + t.integer "game_id" + t.integer "type" t.string "name" t.text "default" + t.text "discription" + t.text "type_opt" + t.integer "display_order" t.datetime "created_at" t.datetime "updated_at" end + add_index "game_settings", ["game_id"], name: "index_game_settings_on_game_id" + create_table "games", force: true do |t| t.text "name" t.integer "min_players_per_team" diff --git a/generate.sh b/generate.sh index 45a8ab6..5079abd 100755 --- a/generate.sh +++ b/generate.sh @@ -37,7 +37,7 @@ bundle exec rails generate scaffold session user:references # Just models bundle exec rails generate model server_settings $NOTEST bundle exec rails generate model tournament_option tournament:references vartype:integer name:string value:text $NOTEST -bundle exec rails generate model game_option vartype:integer name:string default:text $NOTEST +bundle exec rails generate model game_setting game:references type:integer name:string default:text discription:text type_opt:text display_order:integer $NOTEST bundle exec rails generate model score user:references match:references value:integer $NOTEST # Join tables diff --git a/test/fixtures/game_options.yml b/test/fixtures/game_options.yml deleted file mode 100644 index eb4760a..0000000 --- a/test/fixtures/game_options.yml +++ /dev/null @@ -1,11 +0,0 @@ -# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - vartype: 1 - name: MyString - default: MyText - -two: - vartype: 1 - name: MyString - default: MyText diff --git a/test/fixtures/game_settings.yml b/test/fixtures/game_settings.yml new file mode 100644 index 0000000..5626c97 --- /dev/null +++ b/test/fixtures/game_settings.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + game_id: + type: 1 + name: MyString + default: MyText + discription: MyText + type_opt: MyText + display_order: 1 + +two: + game_id: + type: 1 + name: MyString + default: MyText + discription: MyText + type_opt: MyText + display_order: 1 diff --git a/test/models/game_option_test.rb b/test/models/game_option_test.rb deleted file mode 100644 index 1ae5701..0000000 --- a/test/models/game_option_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class GameOptionTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end -end diff --git a/test/models/game_setting_test.rb b/test/models/game_setting_test.rb new file mode 100644 index 0000000..8ab8bcf --- /dev/null +++ b/test/models/game_setting_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class GameSettingTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end -- cgit v1.2.3