From b310ee519d3fce05654f82507c55d8a7eea20df8 Mon Sep 17 00:00:00 2001
From: Rolf Schmidt <rolf.schmidt@znuny.com>
Date: Tue, 15 Sep 2020 09:35:49 +0200
Subject: [PATCH] Fixes #3191 - data privacy obsolete column name.

---
 .../javascripts/app/models/data_privacy_task.coffee      | 2 +-
 db/migrate/20120101000001_create_base.rb                 | 2 --
 db/migrate/20200911070327_data_privacy_delete_name.rb    | 9 +++++++++
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20200911070327_data_privacy_delete_name.rb

diff --git a/app/assets/javascripts/app/models/data_privacy_task.coffee b/app/assets/javascripts/app/models/data_privacy_task.coffee
index eedec22f4..72e63cdc7 100644
--- a/app/assets/javascripts/app/models/data_privacy_task.coffee
+++ b/app/assets/javascripts/app/models/data_privacy_task.coffee
@@ -1,5 +1,5 @@
 class App.DataPrivacyTask extends App.Model
-  @configure 'DataPrivacyTask', 'name', 'state', 'deletable_id', 'deletable_type', 'preferences'
+  @configure 'DataPrivacyTask', 'state', 'deletable_id', 'deletable_type', 'preferences'
   @extend Spine.Model.Ajax
   @url: @apiPath + '/data_privacy_tasks'
   @configure_attributes = [
diff --git a/db/migrate/20120101000001_create_base.rb b/db/migrate/20120101000001_create_base.rb
index 93d2e816c..7f9696eb4 100644
--- a/db/migrate/20120101000001_create_base.rb
+++ b/db/migrate/20120101000001_create_base.rb
@@ -742,7 +742,6 @@ class CreateBase < ActiveRecord::Migration[4.2]
     add_index :smime_certificates, [:subject]
 
     create_table :data_privacy_tasks do |t|
-      t.column :name,                 :string, limit: 150,                        null: true
       t.column :state,                :string, limit: 150, default: 'in process', null: true
       t.references :deletable,        polymorphic: true
       t.string :preferences,          limit: 8000,                                null: true
@@ -750,7 +749,6 @@ class CreateBase < ActiveRecord::Migration[4.2]
       t.column :created_by_id,        :integer,                                   null: false
       t.timestamps limit: 3, null: false
     end
-    add_index :data_privacy_tasks, [:name]
     add_index :data_privacy_tasks, [:state]
   end
 end
diff --git a/db/migrate/20200911070327_data_privacy_delete_name.rb b/db/migrate/20200911070327_data_privacy_delete_name.rb
new file mode 100644
index 000000000..16d205272
--- /dev/null
+++ b/db/migrate/20200911070327_data_privacy_delete_name.rb
@@ -0,0 +1,9 @@
+class DataPrivacyDeleteName < ActiveRecord::Migration[5.2]
+  def change
+
+    # return if it's a new setup
+    return if !Setting.exists?(name: 'system_init_done')
+
+    remove_column :data_privacy_tasks, :name, :string, limit: 150
+  end
+end