From f76c29beee697c8861ba2d479a6f3b2214139829 Mon Sep 17 00:00:00 2001
From: multiple creatures <dev@multiple-creature.party>
Date: Sun, 17 Nov 2019 23:41:28 -0600
Subject: Remove unused and incompatable filter settings.  These will be
 re-added in time as they're rewritten to use database-level filtering.

---
 .../20191118044943_remove_old_filter_columns.rb       | 18 ++++++++++++++++++
 ...191118064252_remove_context_from_custom_filters.rb |  5 +++++
 db/schema.rb                                          | 19 +++----------------
 3 files changed, 26 insertions(+), 16 deletions(-)
 create mode 100644 db/migrate/20191118044943_remove_old_filter_columns.rb
 create mode 100644 db/migrate/20191118064252_remove_context_from_custom_filters.rb

(limited to 'db')

diff --git a/db/migrate/20191118044943_remove_old_filter_columns.rb b/db/migrate/20191118044943_remove_old_filter_columns.rb
new file mode 100644
index 000000000..b5236e7a4
--- /dev/null
+++ b/db/migrate/20191118044943_remove_old_filter_columns.rb
@@ -0,0 +1,18 @@
+class RemoveOldFilterColumns < ActiveRecord::Migration[5.2]
+  def change
+    safety_assured {
+      remove_column :custom_filters, :no_desc
+      remove_column :custom_filters, :desc
+      remove_column :custom_filters, :custom_cw
+      remove_column :custom_filters, :override_cw
+      remove_column :custom_filters, :status_text
+      remove_column :custom_filters, :tags
+      remove_column :custom_filters, :spoiler
+      remove_column :custom_filters, :thread
+      remove_column :custom_filters, :media_only
+      remove_column :custom_filters, :exclude_media
+      remove_column :custom_filters, :whole_word
+      remove_column :custom_filters, :irreversible
+    }
+  end
+end
diff --git a/db/migrate/20191118064252_remove_context_from_custom_filters.rb b/db/migrate/20191118064252_remove_context_from_custom_filters.rb
new file mode 100644
index 000000000..3206e9491
--- /dev/null
+++ b/db/migrate/20191118064252_remove_context_from_custom_filters.rb
@@ -0,0 +1,5 @@
+class RemoveContextFromCustomFilters < ActiveRecord::Migration[5.2]
+  def change
+    safety_assured { remove_column :custom_filters, :context }
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 93b770e2d..0e5aca23d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_11_18_005833) do
+ActiveRecord::Schema.define(version: 2019_11_18_064252) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_trgm"
@@ -251,21 +251,8 @@ ActiveRecord::Schema.define(version: 2019_11_18_005833) do
     t.bigint "account_id"
     t.datetime "expires_at"
     t.text "phrase", default: "", null: false
-    t.string "context", default: [], null: false, array: true
-    t.boolean "irreversible", default: false, null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.boolean "whole_word", default: true, null: false
-    t.boolean "exclude_media", default: false, null: false
-    t.boolean "media_only", default: false, null: false
-    t.boolean "thread", default: false, null: false
-    t.boolean "spoiler", default: false, null: false
-    t.boolean "tags", default: false, null: false
-    t.boolean "status_text", default: false, null: false
-    t.text "custom_cw"
-    t.boolean "override_cw", default: false, null: false
-    t.boolean "desc", default: false, null: false
-    t.boolean "no_desc", default: false, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["account_id"], name: "index_custom_filters_on_account_id"
   end
 
-- 
cgit