From b29e9a881e478126a9e36ebabb459757d60dc4a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= Date: Thu, 6 Mar 2025 13:16:33 +0100 Subject: [PATCH 1/3] fix: update changedModel column in clientLog table to use ENUM and set default value --- db/versions/11481-purpleMastic/00-firstScript.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 db/versions/11481-purpleMastic/00-firstScript.sql diff --git a/db/versions/11481-purpleMastic/00-firstScript.sql b/db/versions/11481-purpleMastic/00-firstScript.sql new file mode 100644 index 0000000000..d07ae0a719 --- /dev/null +++ b/db/versions/11481-purpleMastic/00-firstScript.sql @@ -0,0 +1,7 @@ +ALTER TABLE vn.clientLog MODIFY COLUMN changedModel + ENUM('Client','Address','ClientContact','ClientDms','ClientObservation','ClientSample','ClientUnpaid','Greuge','Recovery','Mandate','TpvTransaction','WorkerDms','Sms') + CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'Client' NOT NULL; + +UPDATE clientLog + SET changedModel = 'Mandate' + WHERE changedModel = ''; From 00f4fdf3f062d647d69cb34940b30bfe6f124d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= Date: Thu, 6 Mar 2025 13:17:09 +0100 Subject: [PATCH 2/3] fix: update clientLog table to specify schema in SQL script --- db/versions/11481-purpleMastic/00-firstScript.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/versions/11481-purpleMastic/00-firstScript.sql b/db/versions/11481-purpleMastic/00-firstScript.sql index d07ae0a719..f9587ad1a1 100644 --- a/db/versions/11481-purpleMastic/00-firstScript.sql +++ b/db/versions/11481-purpleMastic/00-firstScript.sql @@ -2,6 +2,6 @@ ALTER TABLE vn.clientLog MODIFY COLUMN changedModel ENUM('Client','Address','ClientContact','ClientDms','ClientObservation','ClientSample','ClientUnpaid','Greuge','Recovery','Mandate','TpvTransaction','WorkerDms','Sms') CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'Client' NOT NULL; -UPDATE clientLog +UPDATE vn.clientLog SET changedModel = 'Mandate' WHERE changedModel = ''; From 760cc3b09a1f04759ccd9c2b71790dfa3f3eaa67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= Date: Thu, 6 Mar 2025 14:11:48 +0100 Subject: [PATCH 3/3] fix: update mandate_afterDelete trigger to log actions in clientLog and drop mandateLog table --- db/routines/vn/triggers/mandate_afterDelete.sql | 4 ++-- db/versions/11481-purpleMastic/00-firstScript.sql | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/db/routines/vn/triggers/mandate_afterDelete.sql b/db/routines/vn/triggers/mandate_afterDelete.sql index 6ef27bb108..56c2111e96 100644 --- a/db/routines/vn/triggers/mandate_afterDelete.sql +++ b/db/routines/vn/triggers/mandate_afterDelete.sql @@ -3,9 +3,9 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`mandate_afterDelete` AFTER DELETE ON `mandate` FOR EACH ROW BEGIN - INSERT INTO mandateLog + INSERT INTO clientLog SET `action` = 'delete', - `changedModel` = 'mandate', + `changedModel` = 'Mandate', `changedModelId` = OLD.id, `userFk` = account.myUser_getId(); END$$ diff --git a/db/versions/11481-purpleMastic/00-firstScript.sql b/db/versions/11481-purpleMastic/00-firstScript.sql index f9587ad1a1..4678ab6ff2 100644 --- a/db/versions/11481-purpleMastic/00-firstScript.sql +++ b/db/versions/11481-purpleMastic/00-firstScript.sql @@ -2,6 +2,5 @@ ALTER TABLE vn.clientLog MODIFY COLUMN changedModel ENUM('Client','Address','ClientContact','ClientDms','ClientObservation','ClientSample','ClientUnpaid','Greuge','Recovery','Mandate','TpvTransaction','WorkerDms','Sms') CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'Client' NOT NULL; -UPDATE vn.clientLog - SET changedModel = 'Mandate' - WHERE changedModel = ''; +DROP TABLE vn.mandateLog; +