Removed skype field and added Discord on users. Also dropped unused table

4 files changed, 16 insertions, 11 deletions

diff --git a/db/migrate/20190222152220_drop_forums_labels.rb b/db/migrate/20190222152220_drop_forums_labels.rb
new file mode 100644
index 0000000..06d8c4a
--- /dev/null
+++ b/db/migrate/20190222152220_drop_forums_labels.rb
@@ -0,0 +1,5 @@
+class DropForumsLabels < ActiveRecord::Migration
+  def change
+    drop_table :forums_labels
+  end
+end
diff --git a/db/migrate/20190222152638_remove_skype_add_discord_from_users.rb b/db/migrate/20190222152638_remove_skype_add_discord_from_users.rb
new file mode 100644
index 0000000..34f1dea
--- /dev/null
+++ b/db/migrate/20190222152638_remove_skype_add_discord_from_users.rb
@@ -0,0 +1,6 @@
+class RemoveSkypeAddDiscordFromUsers < ActiveRecord::Migration
+  def change
+    remove_column :users, :skype
+    add_column    :users, :discord, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1e4d5f4..0aef574 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: 20180606223258) do
+ActiveRecord::Schema.define(version: 20190222152638) do
 
   create_table "badges", force: :cascade do |t|
     t.string  "name",   limit: 191
@@ -54,11 +54,6 @@ ActiveRecord::Schema.define(version: 20180606223258) do
     t.integer "necro_length",  limit: 4
   end
 
-  create_table "forums_labels", id: false, force: :cascade do |t|
-    t.integer "forum_id", limit: 4
-    t.integer "label_id", limit: 4
-  end
-
   create_table "forumthreads", force: :cascade do |t|
     t.string   "title",          limit: 255
     t.text     "content",        limit: 16777215
@@ -134,7 +129,6 @@ ActiveRecord::Schema.define(version: 20180606223258) do
     t.string   "email",                       limit: 191
     t.text     "about",                       limit: 65535
     t.string   "last_ip",                     limit: 255
-    t.string   "skype",                       limit: 255
     t.string   "youtube",                     limit: 255
     t.string   "youtube_channelname",         limit: 255
     t.string   "twitter",                     limit: 255
@@ -154,14 +148,14 @@ ActiveRecord::Schema.define(version: 20180606223258) do
     t.boolean  "header_scroll",                             default: false
     t.boolean  "dark",                                      default: false
     t.text     "public_key",                  limit: 65535
-    t.string   "totp_secret",                   limit: 255
+    t.string   "totp_secret",                 limit: 255
     t.boolean  "totp_enabled",                              default: false
+    t.string   "discord",                     limit: 191
   end
 
   add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
   add_index "users", ["ign"], name: "index_users_on_ign", unique: true, using: :btree
   add_index "users", ["name"], name: "index_users_on_name", unique: true, using: :btree
-  add_index "users", ["skype"], name: "index_users_on_skype", unique: true, using: :btree
   add_index "users", ["twitter"], name: "index_users_on_twitter", unique: true, using: :btree
   add_index "users", ["uuid"], name: "index_users_on_uuid", unique: true, using: :btree
   add_index "users", ["youtube"], name: "index_users_on_youtube", unique: true, using: :btree
diff --git a/db/seeds.rb b/db/seeds.rb
index f6b731f..7ecb6de 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -32,7 +32,7 @@ deleted_user = User.create!(
   password_confirmation: userpw,
   role: Role.get(:disabled),
   badge: Badge.get(:none),
-  skype: "echo123",
+  discord: "echo123",
   last_ip: "0.0.0.0",
   confirmed: true,
   last_seen: Time.utc(0).to_datetime,
@@ -40,4 +40,4 @@ deleted_user = User.create!(
   utc_time: false,
   dark: false
 )
-deleted_user.update_attribute(:ign, "Steve")
+deleted_user.update_attribute(:ign, "Steve")
\ No newline at end of file