diff options
author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-28 18:44:42 -0400 |
---|---|---|
committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-28 18:44:42 -0400 |
commit | 6ff352e4b565895b2b865e2d1fb49e1de2e8c131 (patch) | |
tree | 52b8fa01fb622d364e4379e9b679af2fd389cad5 | |
parent | 2da30b70123a245c0515d65ea7cc59ddf68a3011 (diff) |
ran the generate thingy
-rw-r--r-- | db/migrate/20140428183808_create_simple_captcha_data.rb (renamed from db/migrate/20140428092839_create_simple_captcha_data.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223805_create_mailboxer.mailboxer_engine.rb (renamed from db/migrate/20140428132832_create_mailboxer.mailboxer_engine.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223806_add_notified_object.mailboxer_engine.rb (renamed from db/migrate/20140428132833_add_notified_object.mailboxer_engine.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223807_add_notification_code.mailboxer_engine.rb (renamed from db/migrate/20140428132834_add_notification_code.mailboxer_engine.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223808_add_attachments.mailboxer_engine.rb (renamed from db/migrate/20140428132835_add_attachments.mailboxer_engine.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223809_rename_receipts_read.mailboxer_engine.rb (renamed from db/migrate/20140428132836_rename_receipts_read.mailboxer_engine.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223810_add_global_notification_support.mailboxer_engine.rb (renamed from db/migrate/20140428132837_add_global_notification_support.mailboxer_engine.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223812_create_delayed_jobs.rb (renamed from db/migrate/20140428132845_create_delayed_jobs.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223815_create_servers.rb (renamed from db/migrate/20140428132852_create_servers.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223819_create_matches.rb (renamed from db/migrate/20140428132900_create_matches.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223823_create_teams.rb (renamed from db/migrate/20140428132907_create_teams.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223827_create_alerts.rb (renamed from db/migrate/20140428132914_create_alerts.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223830_create_pms.rb (renamed from db/migrate/20140428132922_create_pms.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223834_create_tournaments.rb (renamed from db/migrate/20140428132929_create_tournaments.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223838_create_games.rb (renamed from db/migrate/20140428132937_create_games.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223842_create_users.rb (renamed from db/migrate/20140428132944_create_users.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223845_create_sessions.rb (renamed from db/migrate/20140428132951_create_sessions.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223849_create_brackets.rb (renamed from db/migrate/20140428132958_create_brackets.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223853_create_game_settings.rb (renamed from db/migrate/20140428133006_create_game_settings.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223856_create_tournament_settings.rb (renamed from db/migrate/20140428133013_create_tournament_settings.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223900_create_tournament_stages.rb (renamed from db/migrate/20140428133020_create_tournament_stages.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223903_create_statistics.rb (renamed from db/migrate/20140428133026_create_statistics.rb) | 2 | ||||
-rw-r--r-- | db/migrate/20140428223907_create_remote_usernames.rb (renamed from db/migrate/20140428133033_create_remote_usernames.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223911_create_bracket_matches.rb (renamed from db/migrate/20140428133041_create_bracket_matches.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223914_create_api_requests.rb (renamed from db/migrate/20140428133048_create_api_requests.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223918_create_tournament_players_join_table.rb (renamed from db/migrate/20140428133055_create_tournament_players_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223922_create_tournament_hosts_join_table.rb (renamed from db/migrate/20140428133102_create_tournament_hosts_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223925_create_team_user_join_table.rb (renamed from db/migrate/20140428133109_create_team_user_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223929_create_match_team_join_table.rb (renamed from db/migrate/20140428133116_create_match_team_join_table.rb) | 0 | ||||
-rw-r--r-- | db/migrate/20140428223939_add_hidden_attrs_to_user.rb (renamed from db/migrate/20140428133136_add_hidden_attrs_to_user.rb) | 0 | ||||
-rw-r--r-- | db/schema.rb | 4 | ||||
-rw-r--r-- | test/fixtures/statistics.yml | 4 |
32 files changed, 5 insertions, 5 deletions
diff --git a/db/migrate/20140428092839_create_simple_captcha_data.rb b/db/migrate/20140428183808_create_simple_captcha_data.rb index 4573b20..4573b20 100644 --- a/db/migrate/20140428092839_create_simple_captcha_data.rb +++ b/db/migrate/20140428183808_create_simple_captcha_data.rb diff --git a/db/migrate/20140428132832_create_mailboxer.mailboxer_engine.rb b/db/migrate/20140428223805_create_mailboxer.mailboxer_engine.rb index 690cec2..690cec2 100644 --- a/db/migrate/20140428132832_create_mailboxer.mailboxer_engine.rb +++ b/db/migrate/20140428223805_create_mailboxer.mailboxer_engine.rb diff --git a/db/migrate/20140428132833_add_notified_object.mailboxer_engine.rb b/db/migrate/20140428223806_add_notified_object.mailboxer_engine.rb index 7f41ac6..7f41ac6 100644 --- a/db/migrate/20140428132833_add_notified_object.mailboxer_engine.rb +++ b/db/migrate/20140428223806_add_notified_object.mailboxer_engine.rb diff --git a/db/migrate/20140428132834_add_notification_code.mailboxer_engine.rb b/db/migrate/20140428223807_add_notification_code.mailboxer_engine.rb index 04c12ef..04c12ef 100644 --- a/db/migrate/20140428132834_add_notification_code.mailboxer_engine.rb +++ b/db/migrate/20140428223807_add_notification_code.mailboxer_engine.rb diff --git a/db/migrate/20140428132835_add_attachments.mailboxer_engine.rb b/db/migrate/20140428223808_add_attachments.mailboxer_engine.rb index b8d6588..b8d6588 100644 --- a/db/migrate/20140428132835_add_attachments.mailboxer_engine.rb +++ b/db/migrate/20140428223808_add_attachments.mailboxer_engine.rb diff --git a/db/migrate/20140428132836_rename_receipts_read.mailboxer_engine.rb b/db/migrate/20140428223809_rename_receipts_read.mailboxer_engine.rb index 9ce904f..9ce904f 100644 --- a/db/migrate/20140428132836_rename_receipts_read.mailboxer_engine.rb +++ b/db/migrate/20140428223809_rename_receipts_read.mailboxer_engine.rb diff --git a/db/migrate/20140428132837_add_global_notification_support.mailboxer_engine.rb b/db/migrate/20140428223810_add_global_notification_support.mailboxer_engine.rb index 60f67ab..60f67ab 100644 --- a/db/migrate/20140428132837_add_global_notification_support.mailboxer_engine.rb +++ b/db/migrate/20140428223810_add_global_notification_support.mailboxer_engine.rb diff --git a/db/migrate/20140428132845_create_delayed_jobs.rb b/db/migrate/20140428223812_create_delayed_jobs.rb index ec0dd93..ec0dd93 100644 --- a/db/migrate/20140428132845_create_delayed_jobs.rb +++ b/db/migrate/20140428223812_create_delayed_jobs.rb diff --git a/db/migrate/20140428132852_create_servers.rb b/db/migrate/20140428223815_create_servers.rb index fbe1b02..fbe1b02 100644 --- a/db/migrate/20140428132852_create_servers.rb +++ b/db/migrate/20140428223815_create_servers.rb diff --git a/db/migrate/20140428132900_create_matches.rb b/db/migrate/20140428223819_create_matches.rb index bac92d1..bac92d1 100644 --- a/db/migrate/20140428132900_create_matches.rb +++ b/db/migrate/20140428223819_create_matches.rb diff --git a/db/migrate/20140428132907_create_teams.rb b/db/migrate/20140428223823_create_teams.rb index dd8397d..dd8397d 100644 --- a/db/migrate/20140428132907_create_teams.rb +++ b/db/migrate/20140428223823_create_teams.rb diff --git a/db/migrate/20140428132914_create_alerts.rb b/db/migrate/20140428223827_create_alerts.rb index 68a8e10..68a8e10 100644 --- a/db/migrate/20140428132914_create_alerts.rb +++ b/db/migrate/20140428223827_create_alerts.rb diff --git a/db/migrate/20140428132922_create_pms.rb b/db/migrate/20140428223830_create_pms.rb index eb9f443..eb9f443 100644 --- a/db/migrate/20140428132922_create_pms.rb +++ b/db/migrate/20140428223830_create_pms.rb diff --git a/db/migrate/20140428132929_create_tournaments.rb b/db/migrate/20140428223834_create_tournaments.rb index f3715bb..f3715bb 100644 --- a/db/migrate/20140428132929_create_tournaments.rb +++ b/db/migrate/20140428223834_create_tournaments.rb diff --git a/db/migrate/20140428132937_create_games.rb b/db/migrate/20140428223838_create_games.rb index e841667..e841667 100644 --- a/db/migrate/20140428132937_create_games.rb +++ b/db/migrate/20140428223838_create_games.rb diff --git a/db/migrate/20140428132944_create_users.rb b/db/migrate/20140428223842_create_users.rb index 8032870..8032870 100644 --- a/db/migrate/20140428132944_create_users.rb +++ b/db/migrate/20140428223842_create_users.rb diff --git a/db/migrate/20140428132951_create_sessions.rb b/db/migrate/20140428223845_create_sessions.rb index f667f1e..f667f1e 100644 --- a/db/migrate/20140428132951_create_sessions.rb +++ b/db/migrate/20140428223845_create_sessions.rb diff --git a/db/migrate/20140428132958_create_brackets.rb b/db/migrate/20140428223849_create_brackets.rb index 8813bf2..8813bf2 100644 --- a/db/migrate/20140428132958_create_brackets.rb +++ b/db/migrate/20140428223849_create_brackets.rb diff --git a/db/migrate/20140428133006_create_game_settings.rb b/db/migrate/20140428223853_create_game_settings.rb index 06fb72e..06fb72e 100644 --- a/db/migrate/20140428133006_create_game_settings.rb +++ b/db/migrate/20140428223853_create_game_settings.rb diff --git a/db/migrate/20140428133013_create_tournament_settings.rb b/db/migrate/20140428223856_create_tournament_settings.rb index e56697f..e56697f 100644 --- a/db/migrate/20140428133013_create_tournament_settings.rb +++ b/db/migrate/20140428223856_create_tournament_settings.rb diff --git a/db/migrate/20140428133020_create_tournament_stages.rb b/db/migrate/20140428223900_create_tournament_stages.rb index 6e52bf0..6e52bf0 100644 --- a/db/migrate/20140428133020_create_tournament_stages.rb +++ b/db/migrate/20140428223900_create_tournament_stages.rb diff --git a/db/migrate/20140428133026_create_statistics.rb b/db/migrate/20140428223903_create_statistics.rb index cc2e97d..09a435f 100644 --- a/db/migrate/20140428133026_create_statistics.rb +++ b/db/migrate/20140428223903_create_statistics.rb @@ -4,7 +4,7 @@ class CreateStatistics < ActiveRecord::Migration t.references :user, index: true t.references :match, index: true t.string :name - t.integer :value + t.text :json_value t.timestamps end diff --git a/db/migrate/20140428133033_create_remote_usernames.rb b/db/migrate/20140428223907_create_remote_usernames.rb index e265985..e265985 100644 --- a/db/migrate/20140428133033_create_remote_usernames.rb +++ b/db/migrate/20140428223907_create_remote_usernames.rb diff --git a/db/migrate/20140428133041_create_bracket_matches.rb b/db/migrate/20140428223911_create_bracket_matches.rb index 3323e31..3323e31 100644 --- a/db/migrate/20140428133041_create_bracket_matches.rb +++ b/db/migrate/20140428223911_create_bracket_matches.rb diff --git a/db/migrate/20140428133048_create_api_requests.rb b/db/migrate/20140428223914_create_api_requests.rb index 544c330..544c330 100644 --- a/db/migrate/20140428133048_create_api_requests.rb +++ b/db/migrate/20140428223914_create_api_requests.rb diff --git a/db/migrate/20140428133055_create_tournament_players_join_table.rb b/db/migrate/20140428223918_create_tournament_players_join_table.rb index be240e8..be240e8 100644 --- a/db/migrate/20140428133055_create_tournament_players_join_table.rb +++ b/db/migrate/20140428223918_create_tournament_players_join_table.rb diff --git a/db/migrate/20140428133102_create_tournament_hosts_join_table.rb b/db/migrate/20140428223922_create_tournament_hosts_join_table.rb index 7521d89..7521d89 100644 --- a/db/migrate/20140428133102_create_tournament_hosts_join_table.rb +++ b/db/migrate/20140428223922_create_tournament_hosts_join_table.rb diff --git a/db/migrate/20140428133109_create_team_user_join_table.rb b/db/migrate/20140428223925_create_team_user_join_table.rb index f3b57fc..f3b57fc 100644 --- a/db/migrate/20140428133109_create_team_user_join_table.rb +++ b/db/migrate/20140428223925_create_team_user_join_table.rb diff --git a/db/migrate/20140428133116_create_match_team_join_table.rb b/db/migrate/20140428223929_create_match_team_join_table.rb index c2ed1b7..c2ed1b7 100644 --- a/db/migrate/20140428133116_create_match_team_join_table.rb +++ b/db/migrate/20140428223929_create_match_team_join_table.rb diff --git a/db/migrate/20140428133136_add_hidden_attrs_to_user.rb b/db/migrate/20140428223939_add_hidden_attrs_to_user.rb index 9b5c505..9b5c505 100644 --- a/db/migrate/20140428133136_add_hidden_attrs_to_user.rb +++ b/db/migrate/20140428223939_add_hidden_attrs_to_user.rb diff --git a/db/schema.rb b/db/schema.rb index a7910eb..c5032fa 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: 20140428133136) do +ActiveRecord::Schema.define(version: 20140428223939) do create_table "alerts", force: true do |t| t.integer "author_id" @@ -218,7 +218,7 @@ ActiveRecord::Schema.define(version: 20140428133136) do t.integer "user_id" t.integer "match_id" t.string "name" - t.integer "value" + t.text "json_value" t.datetime "created_at" t.datetime "updated_at" end diff --git a/test/fixtures/statistics.yml b/test/fixtures/statistics.yml index 0b5b113..e6bbccf 100644 --- a/test/fixtures/statistics.yml +++ b/test/fixtures/statistics.yml @@ -4,10 +4,10 @@ one: user_id: match_id: name: MyString - value: 1 + json_value: MyText two: user_id: match_id: name: MyString - value: 1 + json_value: MyText |