From c09905a346d4a14feddcd1fccefa0e5dd98f51e3 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 29 Apr 2014 03:44:11 -0400 Subject: generate.sh: remove dead attributes from match --- generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate.sh b/generate.sh index ffcde4b..3a9d738 100755 --- a/generate.sh +++ b/generate.sh @@ -40,7 +40,7 @@ bundle exec rails generate delayed_job:active_record # The whole shebang, models, views, and controllers bundle exec rails generate scaffold server default_user_permissions:integer -bundle exec rails generate scaffold match status:integer tournament_stage:references winner:references remote_id:text submitted_peer_evaluations:integer +bundle exec rails generate scaffold match status:integer tournament_stage:references winner:references bundle exec rails generate scaffold team bundle exec rails generate scaffold alert author:references message:text bundle exec rails generate scaffold pm author:references recipient:references message:text subject:text conversation:references -- cgit v1.2.3 From 4c5c8b978d6bc70811e95e6da5afd06ec7a2e27e Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 29 Apr 2014 03:47:29 -0400 Subject: ran ./generate.sh --- app/controllers/matches_controller.rb | 2 +- app/views/matches/_form.html.erb | 8 --- app/views/matches/index.html.erb | 4 -- app/views/matches/index.json.jbuilder | 2 +- app/views/matches/show.html.erb | 10 ---- app/views/matches/show.json.jbuilder | 2 +- .../20140428183808_create_simple_captcha_data.rb | 15 ------ ...0428223805_create_mailboxer.mailboxer_engine.rb | 62 ---------------------- ...8223806_add_notified_object.mailboxer_engine.rb | 18 ------- ...23807_add_notification_code.mailboxer_engine.rb | 14 ----- ...40428223808_add_attachments.mailboxer_engine.rb | 10 ---- ...223809_rename_receipts_read.mailboxer_engine.rb | 10 ---- ...global_notification_support.mailboxer_engine.rb | 10 ---- db/migrate/20140428223812_create_delayed_jobs.rb | 22 -------- db/migrate/20140428223815_create_servers.rb | 9 ---- db/migrate/20140428223819_create_matches.rb | 13 ----- db/migrate/20140428223823_create_teams.rb | 8 --- db/migrate/20140428223827_create_alerts.rb | 10 ---- db/migrate/20140428223830_create_pms.rb | 13 ----- db/migrate/20140428223834_create_tournaments.rb | 17 ------ db/migrate/20140428223838_create_games.rb | 16 ------ db/migrate/20140428223842_create_users.rb | 13 ----- db/migrate/20140428223845_create_sessions.rb | 11 ---- db/migrate/20140428223849_create_brackets.rb | 11 ---- db/migrate/20140428223853_create_game_settings.rb | 15 ------ .../20140428223856_create_tournament_settings.rb | 15 ------ .../20140428223900_create_tournament_stages.rb | 12 ----- db/migrate/20140428223903_create_statistics.rb | 12 ----- .../20140428223907_create_remote_usernames.rb | 11 ---- .../20140428223911_create_bracket_matches.rb | 11 ---- db/migrate/20140428223914_create_api_requests.rb | 9 ---- ...8223918_create_tournament_players_join_table.rb | 8 --- ...428223922_create_tournament_hosts_join_table.rb | 8 --- .../20140428223925_create_team_user_join_table.rb | 8 --- .../20140428223929_create_match_team_join_table.rb | 8 --- .../20140428223939_add_hidden_attrs_to_user.rb | 6 --- .../20140429034423_create_simple_captcha_data.rb | 15 ++++++ ...0429074419_create_mailboxer.mailboxer_engine.rb | 62 ++++++++++++++++++++++ ...9074420_add_notified_object.mailboxer_engine.rb | 18 +++++++ ...74421_add_notification_code.mailboxer_engine.rb | 14 +++++ ...40429074422_add_attachments.mailboxer_engine.rb | 10 ++++ ...074423_rename_receipts_read.mailboxer_engine.rb | 10 ++++ ...global_notification_support.mailboxer_engine.rb | 10 ++++ db/migrate/20140429074426_create_delayed_jobs.rb | 22 ++++++++ db/migrate/20140429074430_create_servers.rb | 9 ++++ db/migrate/20140429074434_create_matches.rb | 11 ++++ db/migrate/20140429074437_create_teams.rb | 8 +++ db/migrate/20140429074441_create_alerts.rb | 10 ++++ db/migrate/20140429074445_create_pms.rb | 13 +++++ db/migrate/20140429074449_create_tournaments.rb | 17 ++++++ db/migrate/20140429074453_create_games.rb | 16 ++++++ db/migrate/20140429074456_create_users.rb | 13 +++++ db/migrate/20140429074500_create_sessions.rb | 11 ++++ db/migrate/20140429074504_create_brackets.rb | 11 ++++ db/migrate/20140429074508_create_game_settings.rb | 15 ++++++ .../20140429074511_create_tournament_settings.rb | 15 ++++++ .../20140429074515_create_tournament_stages.rb | 12 +++++ db/migrate/20140429074519_create_statistics.rb | 12 +++++ .../20140429074522_create_remote_usernames.rb | 11 ++++ .../20140429074526_create_bracket_matches.rb | 11 ++++ db/migrate/20140429074530_create_api_requests.rb | 9 ++++ ...9074533_create_tournament_players_join_table.rb | 8 +++ ...429074537_create_tournament_hosts_join_table.rb | 8 +++ .../20140429074540_create_team_user_join_table.rb | 8 +++ .../20140429074544_create_match_team_join_table.rb | 8 +++ .../20140429074555_add_hidden_attrs_to_user.rb | 6 +++ db/schema.rb | 4 +- test/controllers/matches_controller_test.rb | 4 +- test/fixtures/matches.yml | 4 -- 69 files changed, 409 insertions(+), 439 deletions(-) delete mode 100644 db/migrate/20140428183808_create_simple_captcha_data.rb delete mode 100644 db/migrate/20140428223805_create_mailboxer.mailboxer_engine.rb delete mode 100644 db/migrate/20140428223806_add_notified_object.mailboxer_engine.rb delete mode 100644 db/migrate/20140428223807_add_notification_code.mailboxer_engine.rb delete mode 100644 db/migrate/20140428223808_add_attachments.mailboxer_engine.rb delete mode 100644 db/migrate/20140428223809_rename_receipts_read.mailboxer_engine.rb delete mode 100644 db/migrate/20140428223810_add_global_notification_support.mailboxer_engine.rb delete mode 100644 db/migrate/20140428223812_create_delayed_jobs.rb delete mode 100644 db/migrate/20140428223815_create_servers.rb delete mode 100644 db/migrate/20140428223819_create_matches.rb delete mode 100644 db/migrate/20140428223823_create_teams.rb delete mode 100644 db/migrate/20140428223827_create_alerts.rb delete mode 100644 db/migrate/20140428223830_create_pms.rb delete mode 100644 db/migrate/20140428223834_create_tournaments.rb delete mode 100644 db/migrate/20140428223838_create_games.rb delete mode 100644 db/migrate/20140428223842_create_users.rb delete mode 100644 db/migrate/20140428223845_create_sessions.rb delete mode 100644 db/migrate/20140428223849_create_brackets.rb delete mode 100644 db/migrate/20140428223853_create_game_settings.rb delete mode 100644 db/migrate/20140428223856_create_tournament_settings.rb delete mode 100644 db/migrate/20140428223900_create_tournament_stages.rb delete mode 100644 db/migrate/20140428223903_create_statistics.rb delete mode 100644 db/migrate/20140428223907_create_remote_usernames.rb delete mode 100644 db/migrate/20140428223911_create_bracket_matches.rb delete mode 100644 db/migrate/20140428223914_create_api_requests.rb delete mode 100644 db/migrate/20140428223918_create_tournament_players_join_table.rb delete mode 100644 db/migrate/20140428223922_create_tournament_hosts_join_table.rb delete mode 100644 db/migrate/20140428223925_create_team_user_join_table.rb delete mode 100644 db/migrate/20140428223929_create_match_team_join_table.rb delete mode 100644 db/migrate/20140428223939_add_hidden_attrs_to_user.rb create mode 100644 db/migrate/20140429034423_create_simple_captcha_data.rb create mode 100644 db/migrate/20140429074419_create_mailboxer.mailboxer_engine.rb create mode 100644 db/migrate/20140429074420_add_notified_object.mailboxer_engine.rb create mode 100644 db/migrate/20140429074421_add_notification_code.mailboxer_engine.rb create mode 100644 db/migrate/20140429074422_add_attachments.mailboxer_engine.rb create mode 100644 db/migrate/20140429074423_rename_receipts_read.mailboxer_engine.rb create mode 100644 db/migrate/20140429074424_add_global_notification_support.mailboxer_engine.rb create mode 100644 db/migrate/20140429074426_create_delayed_jobs.rb create mode 100644 db/migrate/20140429074430_create_servers.rb create mode 100644 db/migrate/20140429074434_create_matches.rb create mode 100644 db/migrate/20140429074437_create_teams.rb create mode 100644 db/migrate/20140429074441_create_alerts.rb create mode 100644 db/migrate/20140429074445_create_pms.rb create mode 100644 db/migrate/20140429074449_create_tournaments.rb create mode 100644 db/migrate/20140429074453_create_games.rb create mode 100644 db/migrate/20140429074456_create_users.rb create mode 100644 db/migrate/20140429074500_create_sessions.rb create mode 100644 db/migrate/20140429074504_create_brackets.rb create mode 100644 db/migrate/20140429074508_create_game_settings.rb create mode 100644 db/migrate/20140429074511_create_tournament_settings.rb create mode 100644 db/migrate/20140429074515_create_tournament_stages.rb create mode 100644 db/migrate/20140429074519_create_statistics.rb create mode 100644 db/migrate/20140429074522_create_remote_usernames.rb create mode 100644 db/migrate/20140429074526_create_bracket_matches.rb create mode 100644 db/migrate/20140429074530_create_api_requests.rb create mode 100644 db/migrate/20140429074533_create_tournament_players_join_table.rb create mode 100644 db/migrate/20140429074537_create_tournament_hosts_join_table.rb create mode 100644 db/migrate/20140429074540_create_team_user_join_table.rb create mode 100644 db/migrate/20140429074544_create_match_team_join_table.rb create mode 100644 db/migrate/20140429074555_add_hidden_attrs_to_user.rb diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index b1162ef..4042d3c 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -69,6 +69,6 @@ class MatchesController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def match_params - params.require(:match).permit(:status, :tournament_stage_id, :winner_id, :remote_id, :submitted_peer_evaluations) + params.require(:match).permit(:status, :tournament_stage_id, :winner_id) end end diff --git a/app/views/matches/_form.html.erb b/app/views/matches/_form.html.erb index 9e09fd8..768b655 100644 --- a/app/views/matches/_form.html.erb +++ b/app/views/matches/_form.html.erb @@ -23,14 +23,6 @@ <%= f.label :winner_id %>
<%= f.text_field :winner_id %> -
- <%= f.label :remote_id %>
- <%= f.text_area :remote_id %> -
-
- <%= f.label :submitted_peer_evaluations %>
- <%= f.number_field :submitted_peer_evaluations %> -
<%= f.submit %>
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index 766c3e8..85c94f2 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -6,8 +6,6 @@ Status Tournament stage Winner - Remote - Submitted peer evaluations @@ -20,8 +18,6 @@ <%= match.status %> <%= match.tournament_stage %> <%= match.winner %> - <%= match.remote_id %> - <%= match.submitted_peer_evaluations %> <%= link_to 'Show', match %> <%= link_to 'Edit', edit_match_path(match) %> <%= link_to 'Destroy', match, method: :delete, data: { confirm: 'Are you sure?' } %> diff --git a/app/views/matches/index.json.jbuilder b/app/views/matches/index.json.jbuilder index bef149d..d5a97fe 100644 --- a/app/views/matches/index.json.jbuilder +++ b/app/views/matches/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@matches) do |match| - json.extract! match, :id, :status, :tournament_stage_id, :winner_id, :remote_id, :submitted_peer_evaluations + json.extract! match, :id, :status, :tournament_stage_id, :winner_id json.url match_url(match, format: :json) end diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb index 8384ff2..b47a045 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -15,15 +15,5 @@ <%= @match.winner %>

-

- Remote: - <%= @match.remote_id %> -

- -

- Submitted peer evaluations: - <%= @match.submitted_peer_evaluations %> -

- <%= link_to 'Edit', edit_match_path(@match) %> | <%= link_to 'Back', matches_path %> diff --git a/app/views/matches/show.json.jbuilder b/app/views/matches/show.json.jbuilder index 145f069..dd2cde3 100644 --- a/app/views/matches/show.json.jbuilder +++ b/app/views/matches/show.json.jbuilder @@ -1 +1 @@ -json.extract! @match, :id, :status, :tournament_stage_id, :winner_id, :remote_id, :submitted_peer_evaluations, :created_at, :updated_at +json.extract! @match, :id, :status, :tournament_stage_id, :winner_id, :created_at, :updated_at diff --git a/db/migrate/20140428183808_create_simple_captcha_data.rb b/db/migrate/20140428183808_create_simple_captcha_data.rb deleted file mode 100644 index 4573b20..0000000 --- a/db/migrate/20140428183808_create_simple_captcha_data.rb +++ /dev/null @@ -1,15 +0,0 @@ -class CreateSimpleCaptchaData < ActiveRecord::Migration - def self.up - create_table :simple_captcha_data do |t| - t.string :key, :limit => 40 - t.string :value, :limit => 6 - t.timestamps - end - - add_index :simple_captcha_data, :key, :name => "idx_key" - end - - def self.down - drop_table :simple_captcha_data - end -end diff --git a/db/migrate/20140428223805_create_mailboxer.mailboxer_engine.rb b/db/migrate/20140428223805_create_mailboxer.mailboxer_engine.rb deleted file mode 100644 index 690cec2..0000000 --- a/db/migrate/20140428223805_create_mailboxer.mailboxer_engine.rb +++ /dev/null @@ -1,62 +0,0 @@ -# This migration comes from mailboxer_engine (originally 20110511145103) -class CreateMailboxer < ActiveRecord::Migration - def self.up - #Tables - #Conversations - create_table :conversations do |t| - t.column :subject, :string, :default => "" - t.column :created_at, :datetime, :null => false - t.column :updated_at, :datetime, :null => false - end - #Receipts - create_table :receipts do |t| - t.references :receiver, :polymorphic => true - t.column :notification_id, :integer, :null => false - t.column :read, :boolean, :default => false - t.column :trashed, :boolean, :default => false - t.column :deleted, :boolean, :default => false - t.column :mailbox_type, :string, :limit => 25 - t.column :created_at, :datetime, :null => false - t.column :updated_at, :datetime, :null => false - end - #Notifications and Messages - create_table :notifications do |t| - t.column :type, :string - t.column :body, :text - t.column :subject, :string, :default => "" - t.references :sender, :polymorphic => true - t.references :object, :polymorphic => true - t.column :conversation_id, :integer - t.column :draft, :boolean, :default => false - t.column :updated_at, :datetime, :null => false - t.column :created_at, :datetime, :null => false - end - - - #Indexes - #Conversations - #Receipts - add_index "receipts","notification_id" - - #Messages - add_index "notifications","conversation_id" - - #Foreign keys - #Conversations - #Receipts - add_foreign_key "receipts", "notifications", :name => "receipts_on_notification_id" - #Messages - add_foreign_key "notifications", "conversations", :name => "notifications_on_conversation_id" - end - - def self.down - #Tables - remove_foreign_key "receipts", :name => "receipts_on_notification_id" - remove_foreign_key "notifications", :name => "notifications_on_conversation_id" - - #Indexes - drop_table :receipts - drop_table :conversations - drop_table :notifications - end -end diff --git a/db/migrate/20140428223806_add_notified_object.mailboxer_engine.rb b/db/migrate/20140428223806_add_notified_object.mailboxer_engine.rb deleted file mode 100644 index 7f41ac6..0000000 --- a/db/migrate/20140428223806_add_notified_object.mailboxer_engine.rb +++ /dev/null @@ -1,18 +0,0 @@ -# This migration comes from mailboxer_engine (originally 20110719110700) -class AddNotifiedObject < ActiveRecord::Migration - def self.up - change_table :notifications do |t| - t.references :notified_object, :polymorphic => true - t.remove :object_id - t.remove :object_type - end - end - - def self.down - change_table :notifications do |t| - t.remove :notified_object_id - t.remove :notified_object_type - t.references :object, :polymorphic => true - end - end -end diff --git a/db/migrate/20140428223807_add_notification_code.mailboxer_engine.rb b/db/migrate/20140428223807_add_notification_code.mailboxer_engine.rb deleted file mode 100644 index 04c12ef..0000000 --- a/db/migrate/20140428223807_add_notification_code.mailboxer_engine.rb +++ /dev/null @@ -1,14 +0,0 @@ -# This migration comes from mailboxer_engine (originally 20110912163911) -class AddNotificationCode < ActiveRecord::Migration - def self.up - change_table :notifications do |t| - t.string :notification_code, :default => nil - end - end - - def self.down - change_table :notifications do |t| - t.remove :notification_code - end - end -end \ No newline at end of file diff --git a/db/migrate/20140428223808_add_attachments.mailboxer_engine.rb b/db/migrate/20140428223808_add_attachments.mailboxer_engine.rb deleted file mode 100644 index b8d6588..0000000 --- a/db/migrate/20140428223808_add_attachments.mailboxer_engine.rb +++ /dev/null @@ -1,10 +0,0 @@ -# This migration comes from mailboxer_engine (originally 20111204163911) -class AddAttachments < ActiveRecord::Migration - def self.up - add_column :notifications, :attachment, :string - end - - def self.down - remove_column :notifications, :attachment - end -end diff --git a/db/migrate/20140428223809_rename_receipts_read.mailboxer_engine.rb b/db/migrate/20140428223809_rename_receipts_read.mailboxer_engine.rb deleted file mode 100644 index 9ce904f..0000000 --- a/db/migrate/20140428223809_rename_receipts_read.mailboxer_engine.rb +++ /dev/null @@ -1,10 +0,0 @@ -# This migration comes from mailboxer_engine (originally 20120813110712) -class RenameReceiptsRead < ActiveRecord::Migration - def up - rename_column :receipts, :read, :is_read - end - - def down - rename_column :receipts, :is_read, :read - end -end diff --git a/db/migrate/20140428223810_add_global_notification_support.mailboxer_engine.rb b/db/migrate/20140428223810_add_global_notification_support.mailboxer_engine.rb deleted file mode 100644 index 60f67ab..0000000 --- a/db/migrate/20140428223810_add_global_notification_support.mailboxer_engine.rb +++ /dev/null @@ -1,10 +0,0 @@ -# This migration comes from mailboxer_engine (originally 20130305144212) -class AddGlobalNotificationSupport < ActiveRecord::Migration - - def change - change_table :notifications do |t| - t.boolean :global, default: false - t.datetime :expires - end - end -end diff --git a/db/migrate/20140428223812_create_delayed_jobs.rb b/db/migrate/20140428223812_create_delayed_jobs.rb deleted file mode 100644 index ec0dd93..0000000 --- a/db/migrate/20140428223812_create_delayed_jobs.rb +++ /dev/null @@ -1,22 +0,0 @@ -class CreateDelayedJobs < ActiveRecord::Migration - def self.up - create_table :delayed_jobs, :force => true do |table| - table.integer :priority, :default => 0, :null => false # Allows some jobs to jump to the front of the queue - table.integer :attempts, :default => 0, :null => false # Provides for retries, but still fail eventually. - table.text :handler, :null => false # YAML-encoded string of the object that will do work - table.text :last_error # reason for last failure (See Note below) - table.datetime :run_at # When to run. Could be Time.zone.now for immediately, or sometime in the future. - table.datetime :locked_at # Set when a client is working on this object - table.datetime :failed_at # Set when all retries have failed (actually, by default, the record is deleted instead) - table.string :locked_by # Who is working on this object (if locked) - table.string :queue # The name of the queue this job is in - table.timestamps - end - - add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority' - end - - def self.down - drop_table :delayed_jobs - end -end diff --git a/db/migrate/20140428223815_create_servers.rb b/db/migrate/20140428223815_create_servers.rb deleted file mode 100644 index fbe1b02..0000000 --- a/db/migrate/20140428223815_create_servers.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateServers < ActiveRecord::Migration - def change - create_table :servers do |t| - t.integer :default_user_permissions - - t.timestamps - end - end -end diff --git a/db/migrate/20140428223819_create_matches.rb b/db/migrate/20140428223819_create_matches.rb deleted file mode 100644 index bac92d1..0000000 --- a/db/migrate/20140428223819_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_stage, index: true - t.references :winner, index: true - t.text :remote_id - t.integer :submitted_peer_evaluations - - t.timestamps - end - end -end diff --git a/db/migrate/20140428223823_create_teams.rb b/db/migrate/20140428223823_create_teams.rb deleted file mode 100644 index dd8397d..0000000 --- a/db/migrate/20140428223823_create_teams.rb +++ /dev/null @@ -1,8 +0,0 @@ -class CreateTeams < ActiveRecord::Migration - def change - create_table :teams do |t| - - t.timestamps - end - end -end diff --git a/db/migrate/20140428223827_create_alerts.rb b/db/migrate/20140428223827_create_alerts.rb deleted file mode 100644 index 68a8e10..0000000 --- a/db/migrate/20140428223827_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/20140428223830_create_pms.rb b/db/migrate/20140428223830_create_pms.rb deleted file mode 100644 index eb9f443..0000000 --- a/db/migrate/20140428223830_create_pms.rb +++ /dev/null @@ -1,13 +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.text :subject - t.references :conversation, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140428223834_create_tournaments.rb b/db/migrate/20140428223834_create_tournaments.rb deleted file mode 100644 index f3715bb..0000000 --- a/db/migrate/20140428223834_create_tournaments.rb +++ /dev/null @@ -1,17 +0,0 @@ -class CreateTournaments < ActiveRecord::Migration - def change - create_table :tournaments do |t| - t.references :game, index: true - t.integer :status - t.string :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.string :scoring_method - - t.timestamps - end - add_index :tournaments, :name, unique: true - end -end diff --git a/db/migrate/20140428223838_create_games.rb b/db/migrate/20140428223838_create_games.rb deleted file mode 100644 index e841667..0000000 --- a/db/migrate/20140428223838_create_games.rb +++ /dev/null @@ -1,16 +0,0 @@ -class CreateGames < ActiveRecord::Migration - def change - create_table :games do |t| - t.references :parent, index: true - t.string :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.string :scoring_method - - t.timestamps - end - add_index :games, :name, unique: true - end -end diff --git a/db/migrate/20140428223842_create_users.rb b/db/migrate/20140428223842_create_users.rb deleted file mode 100644 index 8032870..0000000 --- a/db/migrate/20140428223842_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/20140428223845_create_sessions.rb b/db/migrate/20140428223845_create_sessions.rb deleted file mode 100644 index f667f1e..0000000 --- a/db/migrate/20140428223845_create_sessions.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateSessions < ActiveRecord::Migration - def change - create_table :sessions do |t| - t.references :user, index: true - t.string :token - - t.timestamps - end - add_index :sessions, :token, unique: true - end -end diff --git a/db/migrate/20140428223849_create_brackets.rb b/db/migrate/20140428223849_create_brackets.rb deleted file mode 100644 index 8813bf2..0000000 --- a/db/migrate/20140428223849_create_brackets.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateBrackets < ActiveRecord::Migration - def change - create_table :brackets do |t| - t.references :user, index: true - t.references :tournament, index: true - t.string :name - - t.timestamps - end - end -end diff --git a/db/migrate/20140428223853_create_game_settings.rb b/db/migrate/20140428223853_create_game_settings.rb deleted file mode 100644 index 06fb72e..0000000 --- a/db/migrate/20140428223853_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.string :name - t.integer :vartype - t.text :type_opt - t.text :description - t.integer :display_order - t.text :default - - t.timestamps - end - end -end diff --git a/db/migrate/20140428223856_create_tournament_settings.rb b/db/migrate/20140428223856_create_tournament_settings.rb deleted file mode 100644 index e56697f..0000000 --- a/db/migrate/20140428223856_create_tournament_settings.rb +++ /dev/null @@ -1,15 +0,0 @@ -class CreateTournamentSettings < ActiveRecord::Migration - def change - create_table :tournament_settings do |t| - t.references :tournament, index: true - t.string :name - t.integer :vartype - t.text :type_opt - t.text :description - t.integer :display_order - t.text :value - - t.timestamps - end - end -end diff --git a/db/migrate/20140428223900_create_tournament_stages.rb b/db/migrate/20140428223900_create_tournament_stages.rb deleted file mode 100644 index 6e52bf0..0000000 --- a/db/migrate/20140428223900_create_tournament_stages.rb +++ /dev/null @@ -1,12 +0,0 @@ -class CreateTournamentStages < ActiveRecord::Migration - def change - create_table :tournament_stages do |t| - t.references :tournament, index: true - t.text :structure - t.string :scheduling_method - t.string :seeding_method - - t.timestamps - end - end -end diff --git a/db/migrate/20140428223903_create_statistics.rb b/db/migrate/20140428223903_create_statistics.rb deleted file mode 100644 index 09a435f..0000000 --- a/db/migrate/20140428223903_create_statistics.rb +++ /dev/null @@ -1,12 +0,0 @@ -class CreateStatistics < ActiveRecord::Migration - def change - create_table :statistics do |t| - t.references :user, index: true - t.references :match, index: true - t.string :name - t.text :json_value - - t.timestamps - end - end -end diff --git a/db/migrate/20140428223907_create_remote_usernames.rb b/db/migrate/20140428223907_create_remote_usernames.rb deleted file mode 100644 index e265985..0000000 --- a/db/migrate/20140428223907_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/20140428223911_create_bracket_matches.rb b/db/migrate/20140428223911_create_bracket_matches.rb deleted file mode 100644 index 3323e31..0000000 --- a/db/migrate/20140428223911_create_bracket_matches.rb +++ /dev/null @@ -1,11 +0,0 @@ -class CreateBracketMatches < ActiveRecord::Migration - def change - create_table :bracket_matches do |t| - t.references :bracket, index: true - t.references :match, index: true - t.references :predicted_winner, index: true - - t.timestamps - end - end -end diff --git a/db/migrate/20140428223914_create_api_requests.rb b/db/migrate/20140428223914_create_api_requests.rb deleted file mode 100644 index 544c330..0000000 --- a/db/migrate/20140428223914_create_api_requests.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateApiRequests < ActiveRecord::Migration - def change - create_table :api_requests do |t| - t.string :api_name - - t.timestamps - end - end -end diff --git a/db/migrate/20140428223918_create_tournament_players_join_table.rb b/db/migrate/20140428223918_create_tournament_players_join_table.rb deleted file mode 100644 index be240e8..0000000 --- a/db/migrate/20140428223918_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/20140428223922_create_tournament_hosts_join_table.rb b/db/migrate/20140428223922_create_tournament_hosts_join_table.rb deleted file mode 100644 index 7521d89..0000000 --- a/db/migrate/20140428223922_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/20140428223925_create_team_user_join_table.rb b/db/migrate/20140428223925_create_team_user_join_table.rb deleted file mode 100644 index f3b57fc..0000000 --- a/db/migrate/20140428223925_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/20140428223929_create_match_team_join_table.rb b/db/migrate/20140428223929_create_match_team_join_table.rb deleted file mode 100644 index c2ed1b7..0000000 --- a/db/migrate/20140428223929_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/20140428223939_add_hidden_attrs_to_user.rb b/db/migrate/20140428223939_add_hidden_attrs_to_user.rb deleted file mode 100644 index 9b5c505..0000000 --- a/db/migrate/20140428223939_add_hidden_attrs_to_user.rb +++ /dev/null @@ -1,6 +0,0 @@ -class AddHiddenAttrsToUser < ActiveRecord::Migration - def change - add_column :users, :password_digest, :string - add_column :users, :permissions, :integer - end -end diff --git a/db/migrate/20140429034423_create_simple_captcha_data.rb b/db/migrate/20140429034423_create_simple_captcha_data.rb new file mode 100644 index 0000000..4573b20 --- /dev/null +++ b/db/migrate/20140429034423_create_simple_captcha_data.rb @@ -0,0 +1,15 @@ +class CreateSimpleCaptchaData < ActiveRecord::Migration + def self.up + create_table :simple_captcha_data do |t| + t.string :key, :limit => 40 + t.string :value, :limit => 6 + t.timestamps + end + + add_index :simple_captcha_data, :key, :name => "idx_key" + end + + def self.down + drop_table :simple_captcha_data + end +end diff --git a/db/migrate/20140429074419_create_mailboxer.mailboxer_engine.rb b/db/migrate/20140429074419_create_mailboxer.mailboxer_engine.rb new file mode 100644 index 0000000..690cec2 --- /dev/null +++ b/db/migrate/20140429074419_create_mailboxer.mailboxer_engine.rb @@ -0,0 +1,62 @@ +# This migration comes from mailboxer_engine (originally 20110511145103) +class CreateMailboxer < ActiveRecord::Migration + def self.up + #Tables + #Conversations + create_table :conversations do |t| + t.column :subject, :string, :default => "" + t.column :created_at, :datetime, :null => false + t.column :updated_at, :datetime, :null => false + end + #Receipts + create_table :receipts do |t| + t.references :receiver, :polymorphic => true + t.column :notification_id, :integer, :null => false + t.column :read, :boolean, :default => false + t.column :trashed, :boolean, :default => false + t.column :deleted, :boolean, :default => false + t.column :mailbox_type, :string, :limit => 25 + t.column :created_at, :datetime, :null => false + t.column :updated_at, :datetime, :null => false + end + #Notifications and Messages + create_table :notifications do |t| + t.column :type, :string + t.column :body, :text + t.column :subject, :string, :default => "" + t.references :sender, :polymorphic => true + t.references :object, :polymorphic => true + t.column :conversation_id, :integer + t.column :draft, :boolean, :default => false + t.column :updated_at, :datetime, :null => false + t.column :created_at, :datetime, :null => false + end + + + #Indexes + #Conversations + #Receipts + add_index "receipts","notification_id" + + #Messages + add_index "notifications","conversation_id" + + #Foreign keys + #Conversations + #Receipts + add_foreign_key "receipts", "notifications", :name => "receipts_on_notification_id" + #Messages + add_foreign_key "notifications", "conversations", :name => "notifications_on_conversation_id" + end + + def self.down + #Tables + remove_foreign_key "receipts", :name => "receipts_on_notification_id" + remove_foreign_key "notifications", :name => "notifications_on_conversation_id" + + #Indexes + drop_table :receipts + drop_table :conversations + drop_table :notifications + end +end diff --git a/db/migrate/20140429074420_add_notified_object.mailboxer_engine.rb b/db/migrate/20140429074420_add_notified_object.mailboxer_engine.rb new file mode 100644 index 0000000..7f41ac6 --- /dev/null +++ b/db/migrate/20140429074420_add_notified_object.mailboxer_engine.rb @@ -0,0 +1,18 @@ +# This migration comes from mailboxer_engine (originally 20110719110700) +class AddNotifiedObject < ActiveRecord::Migration + def self.up + change_table :notifications do |t| + t.references :notified_object, :polymorphic => true + t.remove :object_id + t.remove :object_type + end + end + + def self.down + change_table :notifications do |t| + t.remove :notified_object_id + t.remove :notified_object_type + t.references :object, :polymorphic => true + end + end +end diff --git a/db/migrate/20140429074421_add_notification_code.mailboxer_engine.rb b/db/migrate/20140429074421_add_notification_code.mailboxer_engine.rb new file mode 100644 index 0000000..04c12ef --- /dev/null +++ b/db/migrate/20140429074421_add_notification_code.mailboxer_engine.rb @@ -0,0 +1,14 @@ +# This migration comes from mailboxer_engine (originally 20110912163911) +class AddNotificationCode < ActiveRecord::Migration + def self.up + change_table :notifications do |t| + t.string :notification_code, :default => nil + end + end + + def self.down + change_table :notifications do |t| + t.remove :notification_code + end + end +end \ No newline at end of file diff --git a/db/migrate/20140429074422_add_attachments.mailboxer_engine.rb b/db/migrate/20140429074422_add_attachments.mailboxer_engine.rb new file mode 100644 index 0000000..b8d6588 --- /dev/null +++ b/db/migrate/20140429074422_add_attachments.mailboxer_engine.rb @@ -0,0 +1,10 @@ +# This migration comes from mailboxer_engine (originally 20111204163911) +class AddAttachments < ActiveRecord::Migration + def self.up + add_column :notifications, :attachment, :string + end + + def self.down + remove_column :notifications, :attachment + end +end diff --git a/db/migrate/20140429074423_rename_receipts_read.mailboxer_engine.rb b/db/migrate/20140429074423_rename_receipts_read.mailboxer_engine.rb new file mode 100644 index 0000000..9ce904f --- /dev/null +++ b/db/migrate/20140429074423_rename_receipts_read.mailboxer_engine.rb @@ -0,0 +1,10 @@ +# This migration comes from mailboxer_engine (originally 20120813110712) +class RenameReceiptsRead < ActiveRecord::Migration + def up + rename_column :receipts, :read, :is_read + end + + def down + rename_column :receipts, :is_read, :read + end +end diff --git a/db/migrate/20140429074424_add_global_notification_support.mailboxer_engine.rb b/db/migrate/20140429074424_add_global_notification_support.mailboxer_engine.rb new file mode 100644 index 0000000..60f67ab --- /dev/null +++ b/db/migrate/20140429074424_add_global_notification_support.mailboxer_engine.rb @@ -0,0 +1,10 @@ +# This migration comes from mailboxer_engine (originally 20130305144212) +class AddGlobalNotificationSupport < ActiveRecord::Migration + + def change + change_table :notifications do |t| + t.boolean :global, default: false + t.datetime :expires + end + end +end diff --git a/db/migrate/20140429074426_create_delayed_jobs.rb b/db/migrate/20140429074426_create_delayed_jobs.rb new file mode 100644 index 0000000..ec0dd93 --- /dev/null +++ b/db/migrate/20140429074426_create_delayed_jobs.rb @@ -0,0 +1,22 @@ +class CreateDelayedJobs < ActiveRecord::Migration + def self.up + create_table :delayed_jobs, :force => true do |table| + table.integer :priority, :default => 0, :null => false # Allows some jobs to jump to the front of the queue + table.integer :attempts, :default => 0, :null => false # Provides for retries, but still fail eventually. + table.text :handler, :null => false # YAML-encoded string of the object that will do work + table.text :last_error # reason for last failure (See Note below) + table.datetime :run_at # When to run. Could be Time.zone.now for immediately, or sometime in the future. + table.datetime :locked_at # Set when a client is working on this object + table.datetime :failed_at # Set when all retries have failed (actually, by default, the record is deleted instead) + table.string :locked_by # Who is working on this object (if locked) + table.string :queue # The name of the queue this job is in + table.timestamps + end + + add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority' + end + + def self.down + drop_table :delayed_jobs + end +end diff --git a/db/migrate/20140429074430_create_servers.rb b/db/migrate/20140429074430_create_servers.rb new file mode 100644 index 0000000..fbe1b02 --- /dev/null +++ b/db/migrate/20140429074430_create_servers.rb @@ -0,0 +1,9 @@ +class CreateServers < ActiveRecord::Migration + def change + create_table :servers do |t| + t.integer :default_user_permissions + + t.timestamps + end + end +end diff --git a/db/migrate/20140429074434_create_matches.rb b/db/migrate/20140429074434_create_matches.rb new file mode 100644 index 0000000..d80db5f --- /dev/null +++ b/db/migrate/20140429074434_create_matches.rb @@ -0,0 +1,11 @@ +class CreateMatches < ActiveRecord::Migration + def change + create_table :matches do |t| + t.integer :status + t.references :tournament_stage, index: true + t.references :winner, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140429074437_create_teams.rb b/db/migrate/20140429074437_create_teams.rb new file mode 100644 index 0000000..dd8397d --- /dev/null +++ b/db/migrate/20140429074437_create_teams.rb @@ -0,0 +1,8 @@ +class CreateTeams < ActiveRecord::Migration + def change + create_table :teams do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140429074441_create_alerts.rb b/db/migrate/20140429074441_create_alerts.rb new file mode 100644 index 0000000..68a8e10 --- /dev/null +++ b/db/migrate/20140429074441_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/20140429074445_create_pms.rb b/db/migrate/20140429074445_create_pms.rb new file mode 100644 index 0000000..eb9f443 --- /dev/null +++ b/db/migrate/20140429074445_create_pms.rb @@ -0,0 +1,13 @@ +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.text :subject + t.references :conversation, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140429074449_create_tournaments.rb b/db/migrate/20140429074449_create_tournaments.rb new file mode 100644 index 0000000..f3715bb --- /dev/null +++ b/db/migrate/20140429074449_create_tournaments.rb @@ -0,0 +1,17 @@ +class CreateTournaments < ActiveRecord::Migration + def change + create_table :tournaments do |t| + t.references :game, index: true + t.integer :status + t.string :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.string :scoring_method + + t.timestamps + end + add_index :tournaments, :name, unique: true + end +end diff --git a/db/migrate/20140429074453_create_games.rb b/db/migrate/20140429074453_create_games.rb new file mode 100644 index 0000000..e841667 --- /dev/null +++ b/db/migrate/20140429074453_create_games.rb @@ -0,0 +1,16 @@ +class CreateGames < ActiveRecord::Migration + def change + create_table :games do |t| + t.references :parent, index: true + t.string :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.string :scoring_method + + t.timestamps + end + add_index :games, :name, unique: true + end +end diff --git a/db/migrate/20140429074456_create_users.rb b/db/migrate/20140429074456_create_users.rb new file mode 100644 index 0000000..8032870 --- /dev/null +++ b/db/migrate/20140429074456_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/20140429074500_create_sessions.rb b/db/migrate/20140429074500_create_sessions.rb new file mode 100644 index 0000000..f667f1e --- /dev/null +++ b/db/migrate/20140429074500_create_sessions.rb @@ -0,0 +1,11 @@ +class CreateSessions < ActiveRecord::Migration + def change + create_table :sessions do |t| + t.references :user, index: true + t.string :token + + t.timestamps + end + add_index :sessions, :token, unique: true + end +end diff --git a/db/migrate/20140429074504_create_brackets.rb b/db/migrate/20140429074504_create_brackets.rb new file mode 100644 index 0000000..8813bf2 --- /dev/null +++ b/db/migrate/20140429074504_create_brackets.rb @@ -0,0 +1,11 @@ +class CreateBrackets < ActiveRecord::Migration + def change + create_table :brackets do |t| + t.references :user, index: true + t.references :tournament, index: true + t.string :name + + t.timestamps + end + end +end diff --git a/db/migrate/20140429074508_create_game_settings.rb b/db/migrate/20140429074508_create_game_settings.rb new file mode 100644 index 0000000..06fb72e --- /dev/null +++ b/db/migrate/20140429074508_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.string :name + t.integer :vartype + t.text :type_opt + t.text :description + t.integer :display_order + t.text :default + + t.timestamps + end + end +end diff --git a/db/migrate/20140429074511_create_tournament_settings.rb b/db/migrate/20140429074511_create_tournament_settings.rb new file mode 100644 index 0000000..e56697f --- /dev/null +++ b/db/migrate/20140429074511_create_tournament_settings.rb @@ -0,0 +1,15 @@ +class CreateTournamentSettings < ActiveRecord::Migration + def change + create_table :tournament_settings do |t| + t.references :tournament, index: true + t.string :name + t.integer :vartype + t.text :type_opt + t.text :description + t.integer :display_order + t.text :value + + t.timestamps + end + end +end diff --git a/db/migrate/20140429074515_create_tournament_stages.rb b/db/migrate/20140429074515_create_tournament_stages.rb new file mode 100644 index 0000000..6e52bf0 --- /dev/null +++ b/db/migrate/20140429074515_create_tournament_stages.rb @@ -0,0 +1,12 @@ +class CreateTournamentStages < ActiveRecord::Migration + def change + create_table :tournament_stages do |t| + t.references :tournament, index: true + t.text :structure + t.string :scheduling_method + t.string :seeding_method + + t.timestamps + end + end +end diff --git a/db/migrate/20140429074519_create_statistics.rb b/db/migrate/20140429074519_create_statistics.rb new file mode 100644 index 0000000..09a435f --- /dev/null +++ b/db/migrate/20140429074519_create_statistics.rb @@ -0,0 +1,12 @@ +class CreateStatistics < ActiveRecord::Migration + def change + create_table :statistics do |t| + t.references :user, index: true + t.references :match, index: true + t.string :name + t.text :json_value + + t.timestamps + end + end +end diff --git a/db/migrate/20140429074522_create_remote_usernames.rb b/db/migrate/20140429074522_create_remote_usernames.rb new file mode 100644 index 0000000..e265985 --- /dev/null +++ b/db/migrate/20140429074522_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/20140429074526_create_bracket_matches.rb b/db/migrate/20140429074526_create_bracket_matches.rb new file mode 100644 index 0000000..3323e31 --- /dev/null +++ b/db/migrate/20140429074526_create_bracket_matches.rb @@ -0,0 +1,11 @@ +class CreateBracketMatches < ActiveRecord::Migration + def change + create_table :bracket_matches do |t| + t.references :bracket, index: true + t.references :match, index: true + t.references :predicted_winner, index: true + + t.timestamps + end + end +end diff --git a/db/migrate/20140429074530_create_api_requests.rb b/db/migrate/20140429074530_create_api_requests.rb new file mode 100644 index 0000000..544c330 --- /dev/null +++ b/db/migrate/20140429074530_create_api_requests.rb @@ -0,0 +1,9 @@ +class CreateApiRequests < ActiveRecord::Migration + def change + create_table :api_requests do |t| + t.string :api_name + + t.timestamps + end + end +end diff --git a/db/migrate/20140429074533_create_tournament_players_join_table.rb b/db/migrate/20140429074533_create_tournament_players_join_table.rb new file mode 100644 index 0000000..be240e8 --- /dev/null +++ b/db/migrate/20140429074533_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/20140429074537_create_tournament_hosts_join_table.rb b/db/migrate/20140429074537_create_tournament_hosts_join_table.rb new file mode 100644 index 0000000..7521d89 --- /dev/null +++ b/db/migrate/20140429074537_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/20140429074540_create_team_user_join_table.rb b/db/migrate/20140429074540_create_team_user_join_table.rb new file mode 100644 index 0000000..f3b57fc --- /dev/null +++ b/db/migrate/20140429074540_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/20140429074544_create_match_team_join_table.rb b/db/migrate/20140429074544_create_match_team_join_table.rb new file mode 100644 index 0000000..c2ed1b7 --- /dev/null +++ b/db/migrate/20140429074544_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/20140429074555_add_hidden_attrs_to_user.rb b/db/migrate/20140429074555_add_hidden_attrs_to_user.rb new file mode 100644 index 0000000..9b5c505 --- /dev/null +++ b/db/migrate/20140429074555_add_hidden_attrs_to_user.rb @@ -0,0 +1,6 @@ +class AddHiddenAttrsToUser < ActiveRecord::Migration + def change + add_column :users, :password_digest, :string + add_column :users, :permissions, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index c5032fa..1186a7f 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: 20140428223939) do +ActiveRecord::Schema.define(version: 20140429074555) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -111,8 +111,6 @@ ActiveRecord::Schema.define(version: 20140428223939) do t.integer "status" t.integer "tournament_stage_id" t.integer "winner_id" - t.text "remote_id" - t.integer "submitted_peer_evaluations" t.datetime "created_at" t.datetime "updated_at" end diff --git a/test/controllers/matches_controller_test.rb b/test/controllers/matches_controller_test.rb index d4ac1ed..69cbff5 100644 --- a/test/controllers/matches_controller_test.rb +++ b/test/controllers/matches_controller_test.rb @@ -18,7 +18,7 @@ class MatchesControllerTest < ActionController::TestCase test "should create match" do assert_difference('Match.count') do - post :create, match: { remote_id: @match.remote_id, status: @match.status, submitted_peer_evaluations: @match.submitted_peer_evaluations, tournament_stage_id: @match.tournament_stage_id, winner_id: @match.winner_id } + post :create, match: { status: @match.status, tournament_stage_id: @match.tournament_stage_id, winner_id: @match.winner_id } end assert_redirected_to match_path(assigns(:match)) @@ -35,7 +35,7 @@ class MatchesControllerTest < ActionController::TestCase end test "should update match" do - patch :update, id: @match, match: { remote_id: @match.remote_id, status: @match.status, submitted_peer_evaluations: @match.submitted_peer_evaluations, tournament_stage_id: @match.tournament_stage_id, winner_id: @match.winner_id } + patch :update, id: @match, match: { status: @match.status, tournament_stage_id: @match.tournament_stage_id, winner_id: @match.winner_id } assert_redirected_to match_path(assigns(:match)) end diff --git a/test/fixtures/matches.yml b/test/fixtures/matches.yml index 4213238..2a995c7 100644 --- a/test/fixtures/matches.yml +++ b/test/fixtures/matches.yml @@ -4,12 +4,8 @@ one: status: 1 tournament_stage_id: winner_id: - remote_id: MyText - submitted_peer_evaluations: 1 two: status: 1 tournament_stage_id: winner_id: - remote_id: MyText - submitted_peer_evaluations: 1 -- cgit v1.2.3