From c4bba0464d315708cad462bede1ef54bb7ccd05e Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Wed, 7 Oct 2020 18:31:29 +0200
Subject: [PATCH] FEAT #15044 TIME 0:05 Fix sql

---
 migration/20.10/2010.sql | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/migration/20.10/2010.sql b/migration/20.10/2010.sql
index 38529965c89..9fc3e403723 100755
--- a/migration/20.10/2010.sql
+++ b/migration/20.10/2010.sql
@@ -269,13 +269,6 @@ ALTER TABLE configurations RENAME COLUMN service TO privilege;
 DELETE FROM configurations WHERE privilege = 'admin_search';
 INSERT INTO configurations (privilege, value) VALUES ('admin_search', '{"listEvent": {"defaultTab": "dashboard"},"listDisplay":{"templateColumns":6,"subInfos":[{"value":"getPriority","cssClasses":["align_leftData"],"icon":"fa-traffic-light"},{"value":"getCreationAndProcessLimitDates","cssClasses":["align_leftData"],"icon":"fa-calendar"},{"value":"getAssignee","cssClasses":["align_leftData"],"icon":"fa-sitemap"},{"value":"getDoctype","cssClasses":["align_leftData"],"icon":"fa-suitcase"},{"value":"getRecipients","cssClasses":["align_leftData"],"icon":"fa-user"},{"value":"getSenders","cssClasses":["align_leftData"],"icon":"fa-book"}]}}');
 
-
-ALTER TABLE entities DROP COLUMN archival_agency;
-ALTER TABLE entities DROP COLUMN archival_agreement;
-ALTER TABLE entities DROP COLUMN IF EXISTS producer_service;
-ALTER TABLE entities ADD COLUMN producer_service character varying(255);
-UPDATE entities SET producer_service = entity_id;
-
 DROP TABLE IF EXISTS search_templates;
 CREATE TABLE search_templates (
   id serial,
@@ -291,6 +284,12 @@ ALTER TABLE doctypes DROP COLUMN IF EXISTS action_current_use;
 ALTER TABLE doctypes ADD COLUMN action_current_use character varying(255) DEFAULT NULL;
 UPDATE doctypes SET duration_current_use = duration_current_use * 30;
 
+ALTER TABLE entities DROP COLUMN IF EXISTS archival_agency;
+ALTER TABLE entities DROP COLUMN IF EXISTS archival_agreement;
+ALTER TABLE entities DROP COLUMN IF EXISTS producer_service;
+ALTER TABLE entities ADD COLUMN producer_service character varying(255);
+UPDATE entities SET producer_service = entity_id;
+
 /* RE CREATE VIEWS */
 CREATE OR REPLACE VIEW res_view_letterbox AS
 SELECT r.res_id,
-- 
GitLab