From 8a39c6b4a223160d47b293bc07d57d4e77685746 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 16 Jul 2019 18:53:33 +0100
Subject: [PATCH] Drop old user image columns

---
 app/models/user.rb                              | 2 --
 db/migrate/20190716173946_remove_user_images.rb | 9 +++++++++
 db/structure.sql                                | 4 +---
 3 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 db/migrate/20190716173946_remove_user_images.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 6e9062a80..1095dc6ea 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -46,8 +46,6 @@
 class User < ActiveRecord::Base
   require "xml/libxml"
 
-  self.ignored_columns = %w[image_file_name image_fingerprint image_content_type]
-
   has_many :traces, -> { where(:visible => true) }
   has_many :diary_entries, -> { order(:created_at => :desc) }
   has_many :diary_comments, -> { order(:created_at => :desc) }
diff --git a/db/migrate/20190716173946_remove_user_images.rb b/db/migrate/20190716173946_remove_user_images.rb
new file mode 100644
index 000000000..9c68bede6
--- /dev/null
+++ b/db/migrate/20190716173946_remove_user_images.rb
@@ -0,0 +1,9 @@
+class RemoveUserImages < ActiveRecord::Migration[5.2]
+  def change
+    safety_assured do
+      remove_column :users, :image_file_name, :image
+      remove_column :users, :image_fingerprint, :string
+      remove_column :users, :image_content_type, :string
+    end
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 8f4fe3e79..47f3cf7a0 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -1343,7 +1343,6 @@ CREATE TABLE public.users (
     home_zoom smallint DEFAULT 3,
     nearby integer DEFAULT 50,
     pass_salt character varying,
-    image_file_name text,
     email_valid boolean DEFAULT false NOT NULL,
     new_email character varying,
     creation_ip character varying,
@@ -1355,12 +1354,10 @@ CREATE TABLE public.users (
     preferred_editor character varying,
     terms_seen boolean DEFAULT false NOT NULL,
     description_format public.format_enum DEFAULT 'markdown'::public.format_enum NOT NULL,
-    image_fingerprint character varying,
     changesets_count integer DEFAULT 0 NOT NULL,
     traces_count integer DEFAULT 0 NOT NULL,
     diary_entries_count integer DEFAULT 0 NOT NULL,
     image_use_gravatar boolean DEFAULT false NOT NULL,
-    image_content_type character varying,
     auth_provider character varying,
     home_tile bigint,
     tou_agreed timestamp without time zone
@@ -3086,6 +3083,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20190518115041'),
 ('20190623093642'),
 ('20190702193519'),
+('20190716173946'),
 ('21'),
 ('22'),
 ('23'),
-- 
2.43.2