run ./generate.sh

30 files changed, 29 insertions, 50 deletions

diff --git a/app/models/server_setting.rb b/app/models/server_setting.rb
deleted file mode 100644
index 28ae943..0000000
--- a/app/models/server_setting.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class ServerSetting < ActiveRecord::Base
-end
diff --git a/db/migrate/20140421095649_create_simple_captcha_data.rb b/db/migrate/20140421103137_create_simple_captcha_data.rb
index 4573b20..4573b20 100644
--- a/db/migrate/20140421095649_create_simple_captcha_data.rb
+++ b/db/migrate/20140421103137_create_simple_captcha_data.rb
diff --git a/db/migrate/20140421135723_create_server_settings.rb b/db/migrate/20140421135723_create_server_settings.rb
deleted file mode 100644
index dfdd91b..0000000
--- a/db/migrate/20140421135723_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/20140421135652_create_delayed_jobs.rb b/db/migrate/20140421143140_create_delayed_jobs.rb
index ec0dd93..ec0dd93 100644
--- a/db/migrate/20140421135652_create_delayed_jobs.rb
+++ b/db/migrate/20140421143140_create_delayed_jobs.rb
diff --git a/db/migrate/20140421135654_create_servers.rb b/db/migrate/20140421143143_create_servers.rb
index fbe1b02..fbe1b02 100644
--- a/db/migrate/20140421135654_create_servers.rb
+++ b/db/migrate/20140421143143_create_servers.rb
diff --git a/db/migrate/20140421135657_create_matches.rb b/db/migrate/20140421143146_create_matches.rb
index bdeb1cd..bdeb1cd 100644
--- a/db/migrate/20140421135657_create_matches.rb
+++ b/db/migrate/20140421143146_create_matches.rb
diff --git a/db/migrate/20140421135700_create_teams.rb b/db/migrate/20140421143149_create_teams.rb
index fdf9a68..fdf9a68 100644
--- a/db/migrate/20140421135700_create_teams.rb
+++ b/db/migrate/20140421143149_create_teams.rb
diff --git a/db/migrate/20140421135703_create_alerts.rb b/db/migrate/20140421143152_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140421135703_create_alerts.rb
+++ b/db/migrate/20140421143152_create_alerts.rb
diff --git a/db/migrate/20140421135706_create_pms.rb b/db/migrate/20140421143155_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140421135706_create_pms.rb
+++ b/db/migrate/20140421143155_create_pms.rb
diff --git a/db/migrate/20140421135709_create_tournaments.rb b/db/migrate/20140421143158_create_tournaments.rb
index c0d8929..c0d8929 100644
--- a/db/migrate/20140421135709_create_tournaments.rb
+++ b/db/migrate/20140421143158_create_tournaments.rb
diff --git a/db/migrate/20140421135712_create_games.rb b/db/migrate/20140421143201_create_games.rb
index 5e4f56f..5e4f56f 100644
--- a/db/migrate/20140421135712_create_games.rb
+++ b/db/migrate/20140421143201_create_games.rb
diff --git a/db/migrate/20140421135715_create_users.rb b/db/migrate/20140421143204_create_users.rb
index 8032870..8032870 100644
--- a/db/migrate/20140421135715_create_users.rb
+++ b/db/migrate/20140421143204_create_users.rb
diff --git a/db/migrate/20140421135718_create_sessions.rb b/db/migrate/20140421143207_create_sessions.rb
index f667f1e..f667f1e 100644
--- a/db/migrate/20140421135718_create_sessions.rb
+++ b/db/migrate/20140421143207_create_sessions.rb
diff --git a/db/migrate/20140421135721_create_brackets.rb b/db/migrate/20140421143210_create_brackets.rb
index 8813bf2..8813bf2 100644
--- a/db/migrate/20140421135721_create_brackets.rb
+++ b/db/migrate/20140421143210_create_brackets.rb
diff --git a/db/migrate/20140421135726_create_game_settings.rb b/db/migrate/20140421143213_create_game_settings.rb
index b1caf5d..06fb72e 100644
--- a/db/migrate/20140421135726_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/20140421135729_create_tournament_settings.rb b/db/migrate/20140421143216_create_tournament_settings.rb
index a2e8e66..e56697f 100644
--- a/db/migrate/20140421135729_create_tournament_settings.rb
+++ b/db/migrate/20140421143216_create_tournament_settings.rb
@@ -2,8 +2,11 @@ class CreateTournamentSettings < ActiveRecord::Migration
   def change
     create_table :tournament_settings do |t|
       t.references :tournament, index: true
-      t.integer :vartype
       t.string :name
+      t.integer :vartype
+      t.text :type_opt
+      t.text :description
+      t.integer :display_order
       t.text :value
 
       t.timestamps
diff --git a/db/migrate/20140421135732_create_scores.rb b/db/migrate/20140421143219_create_scores.rb
index 4ca0b0b..4ca0b0b 100644
--- a/db/migrate/20140421135732_create_scores.rb
+++ b/db/migrate/20140421143219_create_scores.rb
diff --git a/db/migrate/20140421135735_create_remote_usernames.rb b/db/migrate/20140421143222_create_remote_usernames.rb
index e265985..e265985 100644
--- a/db/migrate/20140421135735_create_remote_usernames.rb
+++ b/db/migrate/20140421143222_create_remote_usernames.rb
diff --git a/db/migrate/20140421135738_create_bracket_matches.rb b/db/migrate/20140421143225_create_bracket_matches.rb
index 3323e31..3323e31 100644
--- a/db/migrate/20140421135738_create_bracket_matches.rb
+++ b/db/migrate/20140421143225_create_bracket_matches.rb
diff --git a/db/migrate/20140421135741_create_api_requests.rb b/db/migrate/20140421143228_create_api_requests.rb
index 544c330..544c330 100644
--- a/db/migrate/20140421135741_create_api_requests.rb
+++ b/db/migrate/20140421143228_create_api_requests.rb
diff --git a/db/migrate/20140421135744_create_tournament_players_join_table.rb b/db/migrate/20140421143231_create_tournament_players_join_table.rb
index be240e8..be240e8 100644
--- a/db/migrate/20140421135744_create_tournament_players_join_table.rb
+++ b/db/migrate/20140421143231_create_tournament_players_join_table.rb
diff --git a/db/migrate/20140421135747_create_tournament_hosts_join_table.rb b/db/migrate/20140421143234_create_tournament_hosts_join_table.rb
index 7521d89..7521d89 100644
--- a/db/migrate/20140421135747_create_tournament_hosts_join_table.rb
+++ b/db/migrate/20140421143234_create_tournament_hosts_join_table.rb
diff --git a/db/migrate/20140421135749_create_team_user_join_table.rb b/db/migrate/20140421143237_create_team_user_join_table.rb
index f3b57fc..f3b57fc 100644
--- a/db/migrate/20140421135749_create_team_user_join_table.rb
+++ b/db/migrate/20140421143237_create_team_user_join_table.rb
diff --git a/db/migrate/20140421135752_create_match_team_join_table.rb b/db/migrate/20140421143239_create_match_team_join_table.rb
index c2ed1b7..c2ed1b7 100644
--- a/db/migrate/20140421135752_create_match_team_join_table.rb
+++ b/db/migrate/20140421143239_create_match_team_join_table.rb
diff --git a/db/migrate/20140421135803_add_hidden_attrs_to_user.rb b/db/migrate/20140421143251_add_hidden_attrs_to_user.rb
index 9b5c505..9b5c505 100644
--- a/db/migrate/20140421135803_add_hidden_attrs_to_user.rb
+++ b/db/migrate/20140421143251_add_hidden_attrs_to_user.rb
diff --git a/db/schema.rb b/db/schema.rb
index 82ba3d5..8e13073 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: 20140421135803) do
+ActiveRecord::Schema.define(version: 20140421143251) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -69,12 +69,12 @@ ActiveRecord::Schema.define(version: 20140421135803) do
 
   create_table "game_settings", force: true do |t|
     t.integer  "game_id"
-    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.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -155,11 +155,6 @@ ActiveRecord::Schema.define(version: 20140421135803) do
   add_index "scores", ["match_id"], name: "index_scores_on_match_id"
   add_index "scores", ["user_id"], name: "index_scores_on_user_id"
 
-  create_table "server_settings", force: true do |t|
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "servers", force: true do |t|
     t.integer  "default_user_permissions"
     t.datetime "created_at"
@@ -200,8 +195,11 @@ ActiveRecord::Schema.define(version: 20140421135803) do
 
   create_table "tournament_settings", force: true do |t|
     t.integer  "tournament_id"
-    t.integer  "vartype"
     t.string   "name"
+    t.integer  "vartype"
+    t.text     "type_opt"
+    t.text     "description"
+    t.integer  "display_order"
     t.text     "value"
     t.datetime "created_at"
     t.datetime "updated_at"
diff --git a/test/fixtures/game_settings.yml b/test/fixtures/game_settings.yml
index 2b574fd..118501b 100644
--- a/test/fixtures/game_settings.yml
+++ b/test/fixtures/game_settings.yml
@@ -2,18 +2,18 @@
 
 one:
   game_id: 
-  stype: 1
   name: MyString
-  default: MyText
-  description: MyText
+  vartype: 1
   type_opt: MyText
+  description: MyText
   display_order: 1
+  default: MyText
 
 two:
   game_id: 
-  stype: 1
   name: MyString
-  default: MyText
-  description: MyText
+  vartype: 1
   type_opt: MyText
+  description: MyText
   display_order: 1
+  default: MyText
diff --git a/test/fixtures/server_settings.yml b/test/fixtures/server_settings.yml
deleted file mode 100644
index 937a0c0..0000000
--- a/test/fixtures/server_settings.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
-
-# This model initially had no columns defined.  If you add columns to the
-# model remove the '{}' from the fixture names and add the columns immediately
-# below each fixture, per the syntax in the comments below
-#
-one: {}
-# column: value
-#
-two: {}
-#  column: value
diff --git a/test/fixtures/tournament_settings.yml b/test/fixtures/tournament_settings.yml
index aa5eaef..6cdf24b 100644
--- a/test/fixtures/tournament_settings.yml
+++ b/test/fixtures/tournament_settings.yml
@@ -2,12 +2,18 @@
 
 one:
   tournament_id: 
-  vartype: 1
   name: MyString
+  vartype: 1
+  type_opt: MyText
+  description: MyText
+  display_order: 1
   value: MyText
 
 two:
   tournament_id: 
-  vartype: 1
   name: MyString
+  vartype: 1
+  type_opt: MyText
+  description: MyText
+  display_order: 1
   value: MyText
diff --git a/test/models/server_setting_test.rb b/test/models/server_setting_test.rb
deleted file mode 100644
index eee32c1..0000000
--- a/test/models/server_setting_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class ServerSettingTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end