From 53de567b59f913624f5f98f9cefadab14982db81 Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Tue, 12 Apr 2022 11:59:39 +0200 Subject: [PATCH] revert fix(user.merge) : waiting for ignore column instructeur_id in ruby code --- app/models/dossier_operation_log.rb | 1 + ...emove_column_instructeur_id_from_dossier_operation_log.rb | 5 ----- db/schema.rb | 3 +++ 3 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 db/migrate/20220406144202_remove_column_instructeur_id_from_dossier_operation_log.rb diff --git a/app/models/dossier_operation_log.rb b/app/models/dossier_operation_log.rb index ac29ae529..9a348680f 100644 --- a/app/models/dossier_operation_log.rb +++ b/app/models/dossier_operation_log.rb @@ -12,6 +12,7 @@ # updated_at :datetime not null # bill_signature_id :bigint # dossier_id :bigint +# instructeur_id :bigint # class DossierOperationLog < ApplicationRecord enum operation: { diff --git a/db/migrate/20220406144202_remove_column_instructeur_id_from_dossier_operation_log.rb b/db/migrate/20220406144202_remove_column_instructeur_id_from_dossier_operation_log.rb deleted file mode 100644 index 5cb117776..000000000 --- a/db/migrate/20220406144202_remove_column_instructeur_id_from_dossier_operation_log.rb +++ /dev/null @@ -1,5 +0,0 @@ -class RemoveColumnInstructeurIdFromDossierOperationLog < ActiveRecord::Migration[6.1] - def change - safety_assured { remove_column :dossier_operation_logs, :instructeur_id } - end -end diff --git a/db/schema.rb b/db/schema.rb index c9dddb756..d59c95dd9 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -267,11 +267,13 @@ ActiveRecord::Schema.define(version: 2022_04_07_081538) do t.text "digest" t.bigint "dossier_id" t.datetime "executed_at" + t.bigint "instructeur_id" t.datetime "keep_until" t.string "operation", null: false t.datetime "updated_at", null: false t.index ["bill_signature_id"], name: "index_dossier_operation_logs_on_bill_signature_id" t.index ["dossier_id"], name: "index_dossier_operation_logs_on_dossier_id" + t.index ["instructeur_id"], name: "index_dossier_operation_logs_on_instructeur_id" t.index ["keep_until"], name: "index_dossier_operation_logs_on_keep_until" end @@ -870,6 +872,7 @@ ActiveRecord::Schema.define(version: 2022_04_07_081538) do add_foreign_key "commentaires", "dossiers" add_foreign_key "commentaires", "experts" add_foreign_key "dossier_operation_logs", "bill_signatures" + add_foreign_key "dossier_operation_logs", "instructeurs" add_foreign_key "dossier_transfer_logs", "dossiers" add_foreign_key "dossiers", "dossier_transfers" add_foreign_key "dossiers", "groupe_instructeurs"