From 0f2b05889cba090e4824f62965ee8d131da09973 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Tue, 1 Apr 2014 17:07:46 -0400 Subject: Re-ran generate. --- db/migrate/20140325214513_create_servers.rb | 8 -------- db/migrate/20140325214516_create_matches.rb | 12 ----------- db/migrate/20140325214518_create_teams.rb | 9 -------- db/migrate/20140325214521_create_alerts.rb | 10 --------- db/migrate/20140325214523_create_pms.rb | 11 ---------- db/migrate/20140325214525_create_tournaments.rb | 17 --------------- db/migrate/20140325214528_create_games.rb | 15 -------------- db/migrate/20140325214531_create_users.rb | 13 ------------ db/migrate/20140325214533_create_sessions.rb | 9 -------- .../20140325214536_create_server_settings.rb | 8 -------- .../20140325214538_create_tournament_options.rb | 12 ----------- db/migrate/20140325214540_create_game_settings.rb | 15 -------------- db/migrate/20140325214543_create_scores.rb | 11 ---------- ...5214545_create_tournament_players_join_table.rb | 8 -------- ...325214548_create_tournament_hosts_join_table.rb | 8 -------- .../20140325214550_create_team_user_join_table.rb | 8 -------- .../20140325214553_create_match_team_join_table.rb | 8 -------- .../20140325214602_add_hidden_attrs_to_user.rb | 8 -------- db/migrate/20140401205355_create_servers.rb | 8 ++++++++ db/migrate/20140401205357_create_matches.rb | 13 ++++++++++++ db/migrate/20140401205400_create_teams.rb | 9 ++++++++ db/migrate/20140401205402_create_alerts.rb | 10 +++++++++ db/migrate/20140401205405_create_pms.rb | 11 ++++++++++ db/migrate/20140401205407_create_tournaments.rb | 13 ++++++++++++ db/migrate/20140401205410_create_games.rb | 15 ++++++++++++++ db/migrate/20140401205412_create_users.rb | 13 ++++++++++++ db/migrate/20140401205415_create_sessions.rb | 9 ++++++++ .../20140401205417_create_server_settings.rb | 8 ++++++++ db/migrate/20140401205420_create_game_settings.rb | 15 ++++++++++++++ ...20140401205422_create_tournament_preferences.rb | 12 +++++++++++ db/migrate/20140401205424_create_scores.rb | 11 ++++++++++ .../20140401205427_create_remote_usernames.rb | 11 ++++++++++ ...1205429_create_tournament_players_join_table.rb | 8 ++++++++ ...401205432_create_tournament_hosts_join_table.rb | 8 ++++++++ .../20140401205434_create_team_user_join_table.rb | 8 ++++++++ .../20140401205437_create_match_team_join_table.rb | 8 ++++++++ .../20140401205446_add_hidden_attrs_to_user.rb | 8 ++++++++ db/schema.rb | 24 ++++++++++++++-------- 38 files changed, 214 insertions(+), 198 deletions(-) delete mode 100644 db/migrate/20140325214513_create_servers.rb delete mode 100644 db/migrate/20140325214516_create_matches.rb delete mode 100644 db/migrate/20140325214518_create_teams.rb delete mode 100644 db/migrate/20140325214521_create_alerts.rb delete mode 100644 db/migrate/20140325214523_create_pms.rb delete mode 100644 db/migrate/20140325214525_create_tournaments.rb delete mode 100644 db/migrate/20140325214528_create_games.rb delete mode 100644 db/migrate/20140325214531_create_users.rb delete mode 100644 db/migrate/20140325214533_create_sessions.rb delete mode 100644 db/migrate/20140325214536_create_server_settings.rb delete mode 100644 db/migrate/20140325214538_create_tournament_options.rb delete mode 100644 db/migrate/20140325214540_create_game_settings.rb delete mode 100644 db/migrate/20140325214543_create_scores.rb delete mode 100644 db/migrate/20140325214545_create_tournament_players_join_table.rb delete mode 100644 db/migrate/20140325214548_create_tournament_hosts_join_table.rb delete mode 100644 db/migrate/20140325214550_create_team_user_join_table.rb delete mode 100644 db/migrate/20140325214553_create_match_team_join_table.rb delete mode 100644 db/migrate/20140325214602_add_hidden_attrs_to_user.rb create mode 100644 db/migrate/20140401205355_create_servers.rb create mode 100644 db/migrate/20140401205357_create_matches.rb create mode 100644 db/migrate/20140401205400_create_teams.rb create mode 100644 db/migrate/20140401205402_create_alerts.rb create mode 100644 db/migrate/20140401205405_create_pms.rb create mode 100644 db/migrate/20140401205407_create_tournaments.rb create mode 100644 db/migrate/20140401205410_create_games.rb create mode 100644 db/migrate/20140401205412_create_users.rb create mode 100644 db/migrate/20140401205415_create_sessions.rb create mode 100644 db/migrate/20140401205417_create_server_settings.rb create mode 100644 db/migrate/20140401205420_create_game_settings.rb create mode 100644 db/migrate/20140401205422_create_tournament_preferences.rb create mode 100644 db/migrate/20140401205424_create_scores.rb create mode 100644 db/migrate/20140401205427_create_remote_usernames.rb create mode 100644 db/migrate/20140401205429_create_tournament_players_join_table.rb create mode 100644 db/migrate/20140401205432_create_tournament_hosts_join_table.rb create mode 100644 db/migrate/20140401205434_create_team_user_join_table.rb create mode 100644 db/migrate/20140401205437_create_match_team_join_table.rb create mode 100644 db/migrate/20140401205446_add_hidden_attrs_to_user.rb (limited to 'db') diff --git a/db/migrate/20140325214513_create_servers.rb b/db/migrate/20140325214513_create_servers.rb deleted file mode 100644 index f33241a..0000000 --- a/db/migrate/20140325214513_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/20140325214516_create_matches.rb b/db/migrate/20140325214516_create_matches.rb deleted file mode 100644 index 30949a8..0000000 --- a/db/migrate/20140325214516_create_matches.rb +++ /dev/null @@ -1,12 +0,0 @@ -class CreateMatches < ActiveRecord::Migration - def change - create_table :matches do |t| - t.integer :status - t.references :tournament, index: true - t.string :name - t.references :winner, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140325214518_create_teams.rb b/db/migrate/20140325214518_create_teams.rb deleted file mode 100644 index fdf9a68..0000000 --- a/db/migrate/20140325214518_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/20140325214521_create_alerts.rb b/db/migrate/20140325214521_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140325214521_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/20140325214523_create_pms.rb b/db/migrate/20140325214523_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140325214523_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/20140325214525_create_tournaments.rb b/db/migrate/20140325214525_create_tournaments.rb deleted file mode 100644 index c0d8929..0000000 --- a/db/migrate/20140325214525_create_tournaments.rb +++ /dev/null @@ -1,17 +0,0 @@ -class CreateTournaments < ActiveRecord::Migration - def change - create_table :tournaments do |t| - t.string :name - 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/20140325214528_create_games.rb b/db/migrate/20140325214528_create_games.rb deleted file mode 100644 index 5e4f56f..0000000 --- a/db/migrate/20140325214528_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/20140325214531_create_users.rb b/db/migrate/20140325214531_create_users.rb deleted file mode 100644 index 8032870..0000000 --- a/db/migrate/20140325214531_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/20140325214533_create_sessions.rb b/db/migrate/20140325214533_create_sessions.rb deleted file mode 100644 index fe25bf2..0000000 --- a/db/migrate/20140325214533_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/20140325214536_create_server_settings.rb b/db/migrate/20140325214536_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140325214536_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/20140325214538_create_tournament_options.rb b/db/migrate/20140325214538_create_tournament_options.rb deleted file mode 100644 index 53b601c..0000000 --- a/db/migrate/20140325214538_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/20140325214540_create_game_settings.rb b/db/migrate/20140325214540_create_game_settings.rb deleted file mode 100644 index 0ebbf18..0000000 --- a/db/migrate/20140325214540_create_game_settings.rb +++ /dev/null @@ -1,15 +0,0 @@ -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/20140325214543_create_scores.rb b/db/migrate/20140325214543_create_scores.rb deleted file mode 100644 index 4ca0b0b..0000000 --- a/db/migrate/20140325214543_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/20140325214545_create_tournament_players_join_table.rb b/db/migrate/20140325214545_create_tournament_players_join_table.rb deleted file mode 100644 index be240e8..0000000 --- a/db/migrate/20140325214545_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/20140325214548_create_tournament_hosts_join_table.rb b/db/migrate/20140325214548_create_tournament_hosts_join_table.rb deleted file mode 100644 index 7521d89..0000000 --- a/db/migrate/20140325214548_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/20140325214550_create_team_user_join_table.rb b/db/migrate/20140325214550_create_team_user_join_table.rb deleted file mode 100644 index f3b57fc..0000000 --- a/db/migrate/20140325214550_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/20140325214553_create_match_team_join_table.rb b/db/migrate/20140325214553_create_match_team_join_table.rb deleted file mode 100644 index c2ed1b7..0000000 --- a/db/migrate/20140325214553_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/20140325214602_add_hidden_attrs_to_user.rb b/db/migrate/20140325214602_add_hidden_attrs_to_user.rb deleted file mode 100644 index 2f1b0b2..0000000 --- a/db/migrate/20140325214602_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/20140401205355_create_servers.rb b/db/migrate/20140401205355_create_servers.rb new file mode 100644 index 0000000..f33241a --- /dev/null +++ b/db/migrate/20140401205355_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/20140401205357_create_matches.rb b/db/migrate/20140401205357_create_matches.rb new file mode 100644 index 0000000..31eea12 --- /dev/null +++ b/db/migrate/20140401205357_create_matches.rb @@ -0,0 +1,13 @@ +class CreateMatches < ActiveRecord::Migration + def change + create_table :matches do |t| + t.integer :status + t.references :tournament, index: true + t.string :name + t.references :winner, index: true + t.string :remote_id + + t.timestamps + end + end +end diff --git a/db/migrate/20140401205400_create_teams.rb b/db/migrate/20140401205400_create_teams.rb new file mode 100644 index 0000000..fdf9a68 --- /dev/null +++ b/db/migrate/20140401205400_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/20140401205402_create_alerts.rb b/db/migrate/20140401205402_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140401205402_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/20140401205405_create_pms.rb b/db/migrate/20140401205405_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140401205405_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/20140401205407_create_tournaments.rb b/db/migrate/20140401205407_create_tournaments.rb new file mode 100644 index 0000000..3e36441 --- /dev/null +++ b/db/migrate/20140401205407_create_tournaments.rb @@ -0,0 +1,13 @@ +class CreateTournaments < ActiveRecord::Migration + def change + create_table :tournaments do |t| + t.string :name + t.references :game, index: true + t.integer :status + t.string :ger + t.boolean :randomized_teams + + t.timestamps + end + end +end diff --git a/db/migrate/20140401205410_create_games.rb b/db/migrate/20140401205410_create_games.rb new file mode 100644 index 0000000..5e4f56f --- /dev/null +++ b/db/migrate/20140401205410_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/20140401205412_create_users.rb b/db/migrate/20140401205412_create_users.rb new file mode 100644 index 0000000..8032870 --- /dev/null +++ b/db/migrate/20140401205412_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/20140401205415_create_sessions.rb b/db/migrate/20140401205415_create_sessions.rb new file mode 100644 index 0000000..fe25bf2 --- /dev/null +++ b/db/migrate/20140401205415_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/20140401205417_create_server_settings.rb b/db/migrate/20140401205417_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140401205417_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/20140401205420_create_game_settings.rb b/db/migrate/20140401205420_create_game_settings.rb new file mode 100644 index 0000000..0ebbf18 --- /dev/null +++ b/db/migrate/20140401205420_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/20140401205422_create_tournament_preferences.rb b/db/migrate/20140401205422_create_tournament_preferences.rb new file mode 100644 index 0000000..991d659 --- /dev/null +++ b/db/migrate/20140401205422_create_tournament_preferences.rb @@ -0,0 +1,12 @@ +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/20140401205424_create_scores.rb b/db/migrate/20140401205424_create_scores.rb new file mode 100644 index 0000000..4ca0b0b --- /dev/null +++ b/db/migrate/20140401205424_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/20140401205427_create_remote_usernames.rb b/db/migrate/20140401205427_create_remote_usernames.rb new file mode 100644 index 0000000..e265985 --- /dev/null +++ b/db/migrate/20140401205427_create_remote_usernames.rb @@ -0,0 +1,11 @@ +class CreateRemoteUsernames < ActiveRecord::Migration + def change + create_table :remote_usernames do |t| + t.references :game, index: true + t.references :user, index: true + t.text :json_value + + t.timestamps + end + end +end diff --git a/db/migrate/20140401205429_create_tournament_players_join_table.rb b/db/migrate/20140401205429_create_tournament_players_join_table.rb new file mode 100644 index 0000000..be240e8 --- /dev/null +++ b/db/migrate/20140401205429_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/20140401205432_create_tournament_hosts_join_table.rb b/db/migrate/20140401205432_create_tournament_hosts_join_table.rb new file mode 100644 index 0000000..7521d89 --- /dev/null +++ b/db/migrate/20140401205432_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/20140401205434_create_team_user_join_table.rb b/db/migrate/20140401205434_create_team_user_join_table.rb new file mode 100644 index 0000000..f3b57fc --- /dev/null +++ b/db/migrate/20140401205434_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/20140401205437_create_match_team_join_table.rb b/db/migrate/20140401205437_create_match_team_join_table.rb new file mode 100644 index 0000000..c2ed1b7 --- /dev/null +++ b/db/migrate/20140401205437_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/20140401205446_add_hidden_attrs_to_user.rb b/db/migrate/20140401205446_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..2f1b0b2 --- /dev/null +++ b/db/migrate/20140401205446_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 4704a45..eda2839 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: 20140325214602) do +ActiveRecord::Schema.define(version: 20140401205446) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -58,6 +58,7 @@ ActiveRecord::Schema.define(version: 20140325214602) do t.integer "tournament_id" t.string "name" t.integer "winner_id" + t.string "remote_id" t.datetime "created_at" t.datetime "updated_at" end @@ -86,6 +87,17 @@ ActiveRecord::Schema.define(version: 20140325214602) do add_index "pms", ["author_id"], name: "index_pms_on_author_id" add_index "pms", ["recipient_id"], name: "index_pms_on_recipient_id" + create_table "remote_usernames", force: true do |t| + t.integer "game_id" + t.integer "user_id" + t.text "json_value" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "remote_usernames", ["game_id"], name: "index_remote_usernames_on_game_id" + add_index "remote_usernames", ["user_id"], name: "index_remote_usernames_on_user_id" + create_table "scores", force: true do |t| t.integer "user_id" t.integer "match_id" @@ -128,7 +140,7 @@ ActiveRecord::Schema.define(version: 20140325214602) do t.integer "user_id", null: false end - create_table "tournament_options", force: true do |t| + create_table "tournament_preferences", force: true do |t| t.integer "tournament_id" t.integer "vartype" t.string "name" @@ -137,17 +149,13 @@ ActiveRecord::Schema.define(version: 20140325214602) do t.datetime "updated_at" end - add_index "tournament_options", ["tournament_id"], name: "index_tournament_options_on_tournament_id" + add_index "tournament_preferences", ["tournament_id"], name: "index_tournament_preferences_on_tournament_id" create_table "tournaments", force: true do |t| t.string "name" t.integer "game_id" 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.string "ger" t.boolean "randomized_teams" t.datetime "created_at" t.datetime "updated_at" -- cgit v1.2.3-2-g168b From a2de6b22a720671b796c88c694db905665fda142 Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Tue, 1 Apr 2014 18:01:53 -0400 Subject: oops, removed ger --- db/migrate/20140401205355_create_servers.rb | 8 -------- db/migrate/20140401205357_create_matches.rb | 13 ------------- db/migrate/20140401205400_create_teams.rb | 9 --------- db/migrate/20140401205402_create_alerts.rb | 10 ---------- db/migrate/20140401205405_create_pms.rb | 11 ----------- db/migrate/20140401205407_create_tournaments.rb | 13 ------------- db/migrate/20140401205410_create_games.rb | 15 --------------- db/migrate/20140401205412_create_users.rb | 13 ------------- db/migrate/20140401205415_create_sessions.rb | 9 --------- db/migrate/20140401205417_create_server_settings.rb | 8 -------- db/migrate/20140401205420_create_game_settings.rb | 15 --------------- .../20140401205422_create_tournament_preferences.rb | 12 ------------ db/migrate/20140401205424_create_scores.rb | 11 ----------- db/migrate/20140401205427_create_remote_usernames.rb | 11 ----------- ...20140401205429_create_tournament_players_join_table.rb | 8 -------- .../20140401205432_create_tournament_hosts_join_table.rb | 8 -------- db/migrate/20140401205434_create_team_user_join_table.rb | 8 -------- db/migrate/20140401205437_create_match_team_join_table.rb | 8 -------- db/migrate/20140401205446_add_hidden_attrs_to_user.rb | 8 -------- db/migrate/20140401215718_create_servers.rb | 8 ++++++++ db/migrate/20140401215720_create_matches.rb | 13 +++++++++++++ db/migrate/20140401215723_create_teams.rb | 9 +++++++++ db/migrate/20140401215725_create_alerts.rb | 10 ++++++++++ db/migrate/20140401215728_create_pms.rb | 11 +++++++++++ db/migrate/20140401215730_create_tournaments.rb | 12 ++++++++++++ db/migrate/20140401215733_create_games.rb | 15 +++++++++++++++ db/migrate/20140401215735_create_users.rb | 13 +++++++++++++ db/migrate/20140401215738_create_sessions.rb | 9 +++++++++ db/migrate/20140401215740_create_server_settings.rb | 8 ++++++++ db/migrate/20140401215743_create_game_settings.rb | 15 +++++++++++++++ .../20140401215745_create_tournament_preferences.rb | 12 ++++++++++++ db/migrate/20140401215747_create_scores.rb | 11 +++++++++++ db/migrate/20140401215750_create_remote_usernames.rb | 11 +++++++++++ ...20140401215752_create_tournament_players_join_table.rb | 8 ++++++++ .../20140401215755_create_tournament_hosts_join_table.rb | 8 ++++++++ db/migrate/20140401215757_create_team_user_join_table.rb | 8 ++++++++ db/migrate/20140401215800_create_match_team_join_table.rb | 8 ++++++++ db/migrate/20140401215809_add_hidden_attrs_to_user.rb | 8 ++++++++ db/schema.rb | 3 +-- 39 files changed, 198 insertions(+), 200 deletions(-) delete mode 100644 db/migrate/20140401205355_create_servers.rb delete mode 100644 db/migrate/20140401205357_create_matches.rb delete mode 100644 db/migrate/20140401205400_create_teams.rb delete mode 100644 db/migrate/20140401205402_create_alerts.rb delete mode 100644 db/migrate/20140401205405_create_pms.rb delete mode 100644 db/migrate/20140401205407_create_tournaments.rb delete mode 100644 db/migrate/20140401205410_create_games.rb delete mode 100644 db/migrate/20140401205412_create_users.rb delete mode 100644 db/migrate/20140401205415_create_sessions.rb delete mode 100644 db/migrate/20140401205417_create_server_settings.rb delete mode 100644 db/migrate/20140401205420_create_game_settings.rb delete mode 100644 db/migrate/20140401205422_create_tournament_preferences.rb delete mode 100644 db/migrate/20140401205424_create_scores.rb delete mode 100644 db/migrate/20140401205427_create_remote_usernames.rb delete mode 100644 db/migrate/20140401205429_create_tournament_players_join_table.rb delete mode 100644 db/migrate/20140401205432_create_tournament_hosts_join_table.rb delete mode 100644 db/migrate/20140401205434_create_team_user_join_table.rb delete mode 100644 db/migrate/20140401205437_create_match_team_join_table.rb delete mode 100644 db/migrate/20140401205446_add_hidden_attrs_to_user.rb create mode 100644 db/migrate/20140401215718_create_servers.rb create mode 100644 db/migrate/20140401215720_create_matches.rb create mode 100644 db/migrate/20140401215723_create_teams.rb create mode 100644 db/migrate/20140401215725_create_alerts.rb create mode 100644 db/migrate/20140401215728_create_pms.rb create mode 100644 db/migrate/20140401215730_create_tournaments.rb create mode 100644 db/migrate/20140401215733_create_games.rb create mode 100644 db/migrate/20140401215735_create_users.rb create mode 100644 db/migrate/20140401215738_create_sessions.rb create mode 100644 db/migrate/20140401215740_create_server_settings.rb create mode 100644 db/migrate/20140401215743_create_game_settings.rb create mode 100644 db/migrate/20140401215745_create_tournament_preferences.rb create mode 100644 db/migrate/20140401215747_create_scores.rb create mode 100644 db/migrate/20140401215750_create_remote_usernames.rb create mode 100644 db/migrate/20140401215752_create_tournament_players_join_table.rb create mode 100644 db/migrate/20140401215755_create_tournament_hosts_join_table.rb create mode 100644 db/migrate/20140401215757_create_team_user_join_table.rb create mode 100644 db/migrate/20140401215800_create_match_team_join_table.rb create mode 100644 db/migrate/20140401215809_add_hidden_attrs_to_user.rb (limited to 'db') diff --git a/db/migrate/20140401205355_create_servers.rb b/db/migrate/20140401205355_create_servers.rb deleted file mode 100644 index f33241a..0000000 --- a/db/migrate/20140401205355_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/20140401205357_create_matches.rb b/db/migrate/20140401205357_create_matches.rb deleted file mode 100644 index 31eea12..0000000 --- a/db/migrate/20140401205357_create_matches.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateMatches < ActiveRecord::Migration - def change - create_table :matches do |t| - t.integer :status - t.references :tournament, index: true - t.string :name - t.references :winner, index: true - t.string :remote_id - - t.timestamps - end - end -end diff --git a/db/migrate/20140401205400_create_teams.rb b/db/migrate/20140401205400_create_teams.rb deleted file mode 100644 index fdf9a68..0000000 --- a/db/migrate/20140401205400_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/20140401205402_create_alerts.rb b/db/migrate/20140401205402_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140401205402_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/20140401205405_create_pms.rb b/db/migrate/20140401205405_create_pms.rb deleted file mode 100644 index 93bb5c6..0000000 --- a/db/migrate/20140401205405_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/20140401205407_create_tournaments.rb b/db/migrate/20140401205407_create_tournaments.rb deleted file mode 100644 index 3e36441..0000000 --- a/db/migrate/20140401205407_create_tournaments.rb +++ /dev/null @@ -1,13 +0,0 @@ -class CreateTournaments < ActiveRecord::Migration - def change - create_table :tournaments do |t| - t.string :name - t.references :game, index: true - t.integer :status - t.string :ger - t.boolean :randomized_teams - - t.timestamps - end - end -end diff --git a/db/migrate/20140401205410_create_games.rb b/db/migrate/20140401205410_create_games.rb deleted file mode 100644 index 5e4f56f..0000000 --- a/db/migrate/20140401205410_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/20140401205412_create_users.rb b/db/migrate/20140401205412_create_users.rb deleted file mode 100644 index 8032870..0000000 --- a/db/migrate/20140401205412_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/20140401205415_create_sessions.rb b/db/migrate/20140401205415_create_sessions.rb deleted file mode 100644 index fe25bf2..0000000 --- a/db/migrate/20140401205415_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/20140401205417_create_server_settings.rb b/db/migrate/20140401205417_create_server_settings.rb deleted file mode 100644 index dfdd91b..0000000 --- a/db/migrate/20140401205417_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/20140401205420_create_game_settings.rb b/db/migrate/20140401205420_create_game_settings.rb deleted file mode 100644 index 0ebbf18..0000000 --- a/db/migrate/20140401205420_create_game_settings.rb +++ /dev/null @@ -1,15 +0,0 @@ -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/20140401205422_create_tournament_preferences.rb b/db/migrate/20140401205422_create_tournament_preferences.rb deleted file mode 100644 index 991d659..0000000 --- a/db/migrate/20140401205422_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/20140401205424_create_scores.rb b/db/migrate/20140401205424_create_scores.rb deleted file mode 100644 index 4ca0b0b..0000000 --- a/db/migrate/20140401205424_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/20140401205427_create_remote_usernames.rb b/db/migrate/20140401205427_create_remote_usernames.rb deleted file mode 100644 index e265985..0000000 --- a/db/migrate/20140401205427_create_remote_usernames.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateRemoteUsernames < ActiveRecord::Migration - def change - create_table :remote_usernames do |t| - t.references :game, index: true - t.references :user, index: true - t.text :json_value - - t.timestamps - end - end -end diff --git a/db/migrate/20140401205429_create_tournament_players_join_table.rb b/db/migrate/20140401205429_create_tournament_players_join_table.rb deleted file mode 100644 index be240e8..0000000 --- a/db/migrate/20140401205429_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/20140401205432_create_tournament_hosts_join_table.rb b/db/migrate/20140401205432_create_tournament_hosts_join_table.rb deleted file mode 100644 index 7521d89..0000000 --- a/db/migrate/20140401205432_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/20140401205434_create_team_user_join_table.rb b/db/migrate/20140401205434_create_team_user_join_table.rb deleted file mode 100644 index f3b57fc..0000000 --- a/db/migrate/20140401205434_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/20140401205437_create_match_team_join_table.rb b/db/migrate/20140401205437_create_match_team_join_table.rb deleted file mode 100644 index c2ed1b7..0000000 --- a/db/migrate/20140401205437_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/20140401205446_add_hidden_attrs_to_user.rb b/db/migrate/20140401205446_add_hidden_attrs_to_user.rb deleted file mode 100644 index 2f1b0b2..0000000 --- a/db/migrate/20140401205446_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/20140401215718_create_servers.rb b/db/migrate/20140401215718_create_servers.rb new file mode 100644 index 0000000..f33241a --- /dev/null +++ b/db/migrate/20140401215718_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/20140401215720_create_matches.rb b/db/migrate/20140401215720_create_matches.rb new file mode 100644 index 0000000..31eea12 --- /dev/null +++ b/db/migrate/20140401215720_create_matches.rb @@ -0,0 +1,13 @@ +class CreateMatches < ActiveRecord::Migration + def change + create_table :matches do |t| + t.integer :status + t.references :tournament, index: true + t.string :name + t.references :winner, index: true + t.string :remote_id + + t.timestamps + end + end +end diff --git a/db/migrate/20140401215723_create_teams.rb b/db/migrate/20140401215723_create_teams.rb new file mode 100644 index 0000000..fdf9a68 --- /dev/null +++ b/db/migrate/20140401215723_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/20140401215725_create_alerts.rb b/db/migrate/20140401215725_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140401215725_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/20140401215728_create_pms.rb b/db/migrate/20140401215728_create_pms.rb new file mode 100644 index 0000000..93bb5c6 --- /dev/null +++ b/db/migrate/20140401215728_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/20140401215730_create_tournaments.rb b/db/migrate/20140401215730_create_tournaments.rb new file mode 100644 index 0000000..55f76a3 --- /dev/null +++ b/db/migrate/20140401215730_create_tournaments.rb @@ -0,0 +1,12 @@ +class CreateTournaments < ActiveRecord::Migration + def change + create_table :tournaments do |t| + t.string :name + t.references :game, index: true + t.integer :status + t.boolean :randomized_teams + + t.timestamps + end + end +end diff --git a/db/migrate/20140401215733_create_games.rb b/db/migrate/20140401215733_create_games.rb new file mode 100644 index 0000000..5e4f56f --- /dev/null +++ b/db/migrate/20140401215733_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/20140401215735_create_users.rb b/db/migrate/20140401215735_create_users.rb new file mode 100644 index 0000000..8032870 --- /dev/null +++ b/db/migrate/20140401215735_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/20140401215738_create_sessions.rb b/db/migrate/20140401215738_create_sessions.rb new file mode 100644 index 0000000..fe25bf2 --- /dev/null +++ b/db/migrate/20140401215738_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/20140401215740_create_server_settings.rb b/db/migrate/20140401215740_create_server_settings.rb new file mode 100644 index 0000000..dfdd91b --- /dev/null +++ b/db/migrate/20140401215740_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/20140401215743_create_game_settings.rb b/db/migrate/20140401215743_create_game_settings.rb new file mode 100644 index 0000000..0ebbf18 --- /dev/null +++ b/db/migrate/20140401215743_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/20140401215745_create_tournament_preferences.rb b/db/migrate/20140401215745_create_tournament_preferences.rb new file mode 100644 index 0000000..991d659 --- /dev/null +++ b/db/migrate/20140401215745_create_tournament_preferences.rb @@ -0,0 +1,12 @@ +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/20140401215747_create_scores.rb b/db/migrate/20140401215747_create_scores.rb new file mode 100644 index 0000000..4ca0b0b --- /dev/null +++ b/db/migrate/20140401215747_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/20140401215750_create_remote_usernames.rb b/db/migrate/20140401215750_create_remote_usernames.rb new file mode 100644 index 0000000..e265985 --- /dev/null +++ b/db/migrate/20140401215750_create_remote_usernames.rb @@ -0,0 +1,11 @@ +class CreateRemoteUsernames < ActiveRecord::Migration + def change + create_table :remote_usernames do |t| + t.references :game, index: true + t.references :user, index: true + t.text :json_value + + t.timestamps + end + end +end diff --git a/db/migrate/20140401215752_create_tournament_players_join_table.rb b/db/migrate/20140401215752_create_tournament_players_join_table.rb new file mode 100644 index 0000000..be240e8 --- /dev/null +++ b/db/migrate/20140401215752_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/20140401215755_create_tournament_hosts_join_table.rb b/db/migrate/20140401215755_create_tournament_hosts_join_table.rb new file mode 100644 index 0000000..7521d89 --- /dev/null +++ b/db/migrate/20140401215755_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/20140401215757_create_team_user_join_table.rb b/db/migrate/20140401215757_create_team_user_join_table.rb new file mode 100644 index 0000000..f3b57fc --- /dev/null +++ b/db/migrate/20140401215757_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/20140401215800_create_match_team_join_table.rb b/db/migrate/20140401215800_create_match_team_join_table.rb new file mode 100644 index 0000000..c2ed1b7 --- /dev/null +++ b/db/migrate/20140401215800_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/20140401215809_add_hidden_attrs_to_user.rb b/db/migrate/20140401215809_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..2f1b0b2 --- /dev/null +++ b/db/migrate/20140401215809_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 eda2839..c3be661 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: 20140401205446) do +ActiveRecord::Schema.define(version: 20140401215809) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -155,7 +155,6 @@ ActiveRecord::Schema.define(version: 20140401205446) do t.string "name" t.integer "game_id" t.integer "status" - t.string "ger" t.boolean "randomized_teams" t.datetime "created_at" t.datetime "updated_at" -- cgit v1.2.3-2-g168b