Re-ran generate.

20 files changed, 31 insertions, 15 deletions

diff --git a/db/migrate/20140325214513_create_servers.rb b/db/migrate/20140401205355_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140325214513_create_servers.rb
+++ b/db/migrate/20140401205355_create_servers.rb
diff --git a/db/migrate/20140325214516_create_matches.rb b/db/migrate/20140401205357_create_matches.rb
index 30949a8..31eea12 100644
--- a/db/migrate/20140325214516_create_matches.rb
+++ b/db/migrate/20140401205357_create_matches.rb
@@ -5,6 +5,7 @@ class CreateMatches < ActiveRecord::Migration
       t.references :tournament, index: true
       t.string :name
       t.references :winner, index: true
+      t.string :remote_id
 
       t.timestamps
     end
diff --git a/db/migrate/20140325214518_create_teams.rb b/db/migrate/20140401205400_create_teams.rb
index fdf9a68..fdf9a68 100644
--- a/db/migrate/20140325214518_create_teams.rb
+++ b/db/migrate/20140401205400_create_teams.rb
diff --git a/db/migrate/20140325214521_create_alerts.rb b/db/migrate/20140401205402_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140325214521_create_alerts.rb
+++ b/db/migrate/20140401205402_create_alerts.rb
diff --git a/db/migrate/20140325214523_create_pms.rb b/db/migrate/20140401205405_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140325214523_create_pms.rb
+++ b/db/migrate/20140401205405_create_pms.rb
diff --git a/db/migrate/20140325214525_create_tournaments.rb b/db/migrate/20140401205407_create_tournaments.rb
index c0d8929..3e36441 100644
--- a/db/migrate/20140325214525_create_tournaments.rb
+++ b/db/migrate/20140401205407_create_tournaments.rb
@@ -4,11 +4,7 @@ class CreateTournaments < ActiveRecord::Migration
       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.string :ger
       t.boolean :randomized_teams
 
       t.timestamps
diff --git a/db/migrate/20140325214528_create_games.rb b/db/migrate/20140401205410_create_games.rb
index 5e4f56f..5e4f56f 100644
--- a/db/migrate/20140325214528_create_games.rb
+++ b/db/migrate/20140401205410_create_games.rb
diff --git a/db/migrate/20140325214531_create_users.rb b/db/migrate/20140401205412_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140325214531_create_users.rb
+++ b/db/migrate/20140401205412_create_users.rb
diff --git a/db/migrate/20140325214533_create_sessions.rb b/db/migrate/20140401205415_create_sessions.rb
index fe25bf2..fe25bf2 100644
--- a/db/migrate/20140325214533_create_sessions.rb
+++ b/db/migrate/20140401205415_create_sessions.rb
diff --git a/db/migrate/20140325214536_create_server_settings.rb b/db/migrate/20140401205417_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140325214536_create_server_settings.rb
+++ b/db/migrate/20140401205417_create_server_settings.rb
diff --git a/db/migrate/20140325214540_create_game_settings.rb b/db/migrate/20140401205420_create_game_settings.rb
index 0ebbf18..0ebbf18 100644
--- a/db/migrate/20140325214540_create_game_settings.rb
+++ b/db/migrate/20140401205420_create_game_settings.rb
diff --git a/db/migrate/20140325214538_create_tournament_options.rb b/db/migrate/20140401205422_create_tournament_preferences.rb
index 53b601c..991d659 100644
--- a/db/migrate/20140325214538_create_tournament_options.rb
+++ b/db/migrate/20140401205422_create_tournament_preferences.rb
@@ -1,6 +1,6 @@
-class CreateTournamentOptions < ActiveRecord::Migration
+class CreateTournamentPreferences < ActiveRecord::Migration
   def change
-    create_table :tournament_options do |t|
+    create_table :tournament_preferences do |t|
       t.references :tournament, index: true
       t.integer :vartype
       t.string :name
diff --git a/db/migrate/20140325214543_create_scores.rb b/db/migrate/20140401205424_create_scores.rb
index 4ca0b0b..4ca0b0b 100644
--- a/db/migrate/20140325214543_create_scores.rb
+++ b/db/migrate/20140401205424_create_scores.rb
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/20140325214545_create_tournament_players_join_table.rb b/db/migrate/20140401205429_create_tournament_players_join_table.rb
index be240e8..be240e8 100644
--- a/db/migrate/20140325214545_create_tournament_players_join_table.rb
+++ b/db/migrate/20140401205429_create_tournament_players_join_table.rb
diff --git a/db/migrate/20140325214548_create_tournament_hosts_join_table.rb b/db/migrate/20140401205432_create_tournament_hosts_join_table.rb
index 7521d89..7521d89 100644
--- a/db/migrate/20140325214548_create_tournament_hosts_join_table.rb
+++ b/db/migrate/20140401205432_create_tournament_hosts_join_table.rb
diff --git a/db/migrate/20140325214550_create_team_user_join_table.rb b/db/migrate/20140401205434_create_team_user_join_table.rb
index f3b57fc..f3b57fc 100644
--- a/db/migrate/20140325214550_create_team_user_join_table.rb
+++ b/db/migrate/20140401205434_create_team_user_join_table.rb
diff --git a/db/migrate/20140325214553_create_match_team_join_table.rb b/db/migrate/20140401205437_create_match_team_join_table.rb
index c2ed1b7..c2ed1b7 100644
--- a/db/migrate/20140325214553_create_match_team_join_table.rb
+++ b/db/migrate/20140401205437_create_match_team_join_table.rb
diff --git a/db/migrate/20140325214602_add_hidden_attrs_to_user.rb b/db/migrate/20140401205446_add_hidden_attrs_to_user.rb
index 2f1b0b2..2f1b0b2 100644
--- a/db/migrate/20140325214602_add_hidden_attrs_to_user.rb
+++ b/db/migrate/20140401205446_add_hidden_attrs_to_user.rb
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"